From 95538498f0f96db0d1d602f8004eb62fb576a47a Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Wed, 12 Nov 2014 12:26:45 +0100
Subject: [PATCH] Make pusher log fallback configurable and disable it by
 default

---
 assets/scripts/app/models/log.coffee | 6 +++++-
 assets/scripts/travis.coffee         | 1 +
 config.ru                            | 3 ++-
 public/index.html                    | 1 +
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/assets/scripts/app/models/log.coffee b/assets/scripts/app/models/log.coffee
index 26c4323f..ef9b396e 100644
--- a/assets/scripts/app/models/log.coffee
+++ b/assets/scripts/app/models/log.coffee
@@ -31,7 +31,11 @@ require 'travis/log_chunks'
     if parts = @get('parts')
       parts.destroy()
 
-    parts = Travis.LogChunks.create(content: [], missingPartsCallback: => @fetchMissingParts.apply(this, arguments))
+    if Travis.config.pusher_log_fallback
+      parts = Travis.LogChunks.create(content: [], missingPartsCallback: => @fetchMissingParts.apply(this, arguments))
+    else
+      parts = Ember.ArrayProxy.create(content: [])
+
     @set 'parts', parts
     # @set 'parts', Travis.ChunkBuffer.create(content: [])
 
diff --git a/assets/scripts/travis.coffee b/assets/scripts/travis.coffee
index 08835a6c..41a93ef0 100644
--- a/assets/scripts/travis.coffee
+++ b/assets/scripts/travis.coffee
@@ -88,6 +88,7 @@ $.extend Travis,
     caches_enabled: $('meta[name="travis.caches_enabled"]').attr('value') == 'true'
     show_repos_hint: 'private'
     avatar_default_url: 'https://travis-ci.org/images/mailer/mascot-avatar-40px.png'
+    pusher_log_fallback:  $('meta[name="travis.pusher_log_fallback"]').attr('value') == 'true'
 
   CONFIG_KEYS_MAP: {
     go:          'Go'
diff --git a/config.ru b/config.ru
index 6d575869..4718f1b9 100644
--- a/config.ru
+++ b/config.ru
@@ -35,5 +35,6 @@ run Travis::Web::App.build(
   root:            File.expand_path('../public', __FILE__),
   server_start:    Time.now,
   caches_enabled:  ENV['CACHES_ENABLED'],
-  ssh_key_enabled: ENV['SSH_KEY_ENABLED']
+  ssh_key_enabled: ENV['SSH_KEY_ENABLED'],
+  pusher_log_fallback:  ENV['PUSHER_LOG_FALLBACK']
 )
diff --git a/public/index.html b/public/index.html
index 0d7eb6e9..c0ac7692 100644
--- a/public/index.html
+++ b/public/index.html
@@ -10,6 +10,7 @@
     <meta name="travis.pusher_host" value="ws.pusherapp.com">
     <meta name="travis.ga_code" value="UA-24868285-1">
     <meta name="travis.caches_enabled" value="false">
+    <meta name="travis.pusher_log_fallback" value="false">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Travis CI - Free Hosted Continuous Integration Platform for the Open Source Community</title>
     <link rel="dns-prefetch" href="//api.travis-ci.org">