sidekiq-redislog 0.0.6 → 0.0.7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sidekiq-redislog (0.0.6)
+    sidekiq-redislog (0.0.7)
       sidekiq (>= 2.2.1)
       sinatra
       slim

data/README.md

@@ -44,14 +44,11 @@ Released under the MIT License. See the [LICENSE][license] file for further deta
 
 ## TODO
 
-- XHR polling (< IE8 etc.)
 - Connect/Disconnect buttons since it consumes a thread for the poller.
 
 
 ## Notes
 
-If you mount sidekiq to a non-standard route ie. mount Sidekiq::Web => '/admin/sidekiq' then you'll have to
-redirect the stream url (which javascript hits via SSE):
-  ```match '/sidekiq/redis_log_stream' => redirect('/admin/sidekiq/redis_log_stream')```
-  in ```routes.rb```
+If you mount sidekiq to a non-standard route ie. mount Sidekiq::Web => '/admin/sidekiq' it will automatically
+handle remapping of the stream URI.
 

data/lib/sidekiq/redislog/redis_log_helper.rb

@@ -2,11 +2,11 @@ module Sinatra
   module RedisLogHelper
     def set_sse_headers response
 
-      response.headers.delete('Content-Length') # no content length
-      response.headers['X-Accel-Buffering'] = 'no' # for nginx
-      response.headers["Connection"]    = "keepalive" #optimisation
-      response.headers["Cache-Control"] = "no-cache, no-store" #important for browsers
-      response.headers['Last-Modified'] = Time.now.to_s # #fixes buffering
+      response.headers.delete('Content-Length')                 # no content length
+      response.headers['X-Accel-Buffering'] = 'no'              # for nginx
+      response.headers["Connection"]    = "keepalive"           # optimisation
+      response.headers["Cache-Control"] = "no-cache, no-store"  # important for browsers
+      response.headers['Last-Modified'] = Time.now.to_s         # fixes buffering
 
     end
 
@@ -33,7 +33,6 @@ module Sinatra
       end
 
       config
-
     end
   end
 end

data/lib/sidekiq/redislog/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module RedisLog
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

data/lib/sidekiq/redislog/views/sidekiq_redis_log.erb

@@ -7,12 +7,11 @@
   var show_logs_for = function(event_channel, event_id, log_id) {
 
     if (!!window.EventSource) {
-      source = new EventSource(event_channel); // match routes.rb
-
-      element = document.getElementById(log_id); // match template
+      var element = document.getElementById(log_id); // match view template
+      source = new EventSource(event_channel);       // match routes.rb
 
       source.addEventListener(event_id, function(e) {
-        //firefox has no 'data'
+        // firefox has no 'data'
         if (e.data) data = e.data; else data = e;
 
         element.innerHTML += data + "\n";
@@ -20,10 +19,13 @@
       });
     }
     else {
-      // Result to xhr polling :(  TODO
+      if (console && console.log) {
+        console.log('Sorry - This browser does not support server-sent events (SSE).');
+      }
     }
   };
 
-  show_logs_for('/sidekiq/redis_log_stream', 'redis_log', 'logger')
+  var stream_path = document.location.pathname + '_log_stream';
+  show_logs_for(stream_path, 'redis_log', 'logger');
 
 </script>

data/lib/sidekiq/redislog/views/sidekiq_redis_log.slim

@@ -8,12 +8,11 @@ javascript:
   var show_logs_for = function(event_channel, event_id, log_id) {
 
     if (!!window.EventSource) {
-      source = new EventSource(event_channel); // match routes.rb
-
-      element = document.getElementById(log_id); // match template
+      var element = document.getElementById(log_id); // match view template
+      source = new EventSource(event_channel);       // match routes.rb
 
       source.addEventListener(event_id, function(e) {
-        //firefox has no 'data'
+        // firefox has no 'data'
         if (e.data) data = e.data; else data = e;
 
         element.innerHTML += data + "\n";
@@ -21,9 +20,12 @@ javascript:
       });
     }
     else {
-      // Result to xhr polling :(  TODO
+      if (console && console.log) {
+        console.log('Sorry - This browser does not support server-sent events (SSE).');
+      }
     }
   };
 
-  show_logs_for('/sidekiq/redis_log_stream', 'redis_log', 'logger')
+  var stream_path = document.location.pathname + '_log_stream';
+  show_logs_for(stream_path, 'redis_log', 'logger');
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-redislog
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-26 00:00:00.000000000 Z
+date: 2013-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -146,7 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1763261188821529237
+      hash: 1548494212431323022
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1763261188821529237
+      hash: 1548494212431323022
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25