sidekiq 2.2.0 → 2.2.1

data/Changes.md

@@ -1,6 +1,16 @@
+2.2.1
+-----------
+
+- Add support for custom tabs to Sidekiq::Web [#346]
+- Change capistrano recipe to run 'quiet' before deploy:update\_code so
+  it is run upon both 'deploy' and 'deploy:migrations'. [#352]
+- Rescue Exception rather than StandardError to catch and log any sort
+  of Processor death.
+
 2.2.0
 -----------
 
+- Roll back Celluloid optimizations in 2.1.0 which caused instability.
 - Add extension to delay any arbitrary class method to Sidekiq.
   Previously this was limited to ActiveRecord classes.
 

data/lib/sidekiq/capistrano.rb

@@ -1,28 +1,29 @@
 Capistrano::Configuration.instance.load do
-  before "deploy",        "sidekiq:quiet"
+  before "deploy:update_code", "sidekiq:quiet"
   after "deploy:stop",    "sidekiq:stop"
   after "deploy:start",   "sidekiq:start"
   after "deploy:restart", "sidekiq:restart"
 
   _cset(:sidekiq_timeout) { 10 }
-  _cset(:sidekiq_role) { :app }
+  _cset(:sidekiq_role)    { :app }
+  _cset(:sidekiq_pid)     { "#{current_path}/tmp/pids/sidekiq.pid" }
 
   namespace :sidekiq do
 
     desc "Quiet sidekiq (stop accepting new work)"
     task :quiet, :roles => lambda { fetch(:sidekiq_role) }, :on_no_matching_servers => :continue do
-      run "if [ -d #{current_path} ] && [ -f #{current_path}/tmp/pids/sidekiq.pid ]; then cd #{current_path} && #{fetch(:bundle_cmd, "bundle")} exec sidekiqctl quiet #{current_path}/tmp/pids/sidekiq.pid ; fi"
+      run "if [ -d #{current_path} ] && [ -f #{fetch :sidekiq_pid} ]; then cd #{current_path} && #{fetch(:bundle_cmd, "bundle")} exec sidekiqctl quiet #{fetch :sidekiq_pid} ; fi"
     end
 
     desc "Stop sidekiq"
     task :stop, :roles => lambda { fetch(:sidekiq_role) }, :on_no_matching_servers => :continue do
-      run "if [ -d #{current_path} ] && [ -f #{current_path}/tmp/pids/sidekiq.pid ]; then cd #{current_path} && #{fetch(:bundle_cmd, "bundle")} exec sidekiqctl stop #{current_path}/tmp/pids/sidekiq.pid #{fetch :sidekiq_timeout} ; fi"
+      run "if [ -d #{current_path} ] && [ -f #{fetch :sidekiq_pid} ]; then cd #{current_path} && #{fetch(:bundle_cmd, "bundle")} exec sidekiqctl stop #{fetch :sidekiq_pid} #{fetch :sidekiq_timeout} ; fi"
     end
 
     desc "Start sidekiq"
     task :start, :roles => lambda { fetch(:sidekiq_role) }, :on_no_matching_servers => :continue do
       rails_env = fetch(:rails_env, "production")
-      run "cd #{current_path} ; nohup #{fetch(:bundle_cmd, "bundle")} exec sidekiq -e #{rails_env} -C #{current_path}/config/sidekiq.yml -P #{current_path}/tmp/pids/sidekiq.pid >> #{current_path}/log/sidekiq.log 2>&1 &", :pty => false
+      run "cd #{current_path} ; nohup #{fetch(:bundle_cmd, "bundle")} exec sidekiq -e #{rails_env} -C #{current_path}/config/sidekiq.yml -P #{fetch :sidekiq_pid} >> #{current_path}/log/sidekiq.log 2>&1 &", :pty => false
     end
 
     desc "Restart sidekiq"

data/lib/sidekiq/processor.rb

@@ -43,7 +43,7 @@ module Sidekiq
               worker.perform(*cloned(msg['args']))
             end
           end
-        rescue => ex
+        rescue Exception => ex
           handle_exception(ex, msg || { :message => msgstr })
           raise
         end

data/lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "2.2.0"
+  VERSION = "2.2.1"
 end

data/lib/sidekiq/web.rb

@@ -111,6 +111,10 @@ module Sidekiq
       def display_args(args, count=100)
         args.map { |arg| a = arg.inspect; a.size > count ? "#{a[0..count]}..." : a }.join(", ")
       end
+
+      def tabs
+        self.class.tabs
+      end
     end
 
     get "/" do
@@ -223,6 +227,10 @@ module Sidekiq
       end
     end
 
+    def self.tabs
+      @tabs ||= ["Queues", "Retries", "Scheduled"]
+    end
+
   end
 
 end

data/test/test_testing_inline.rb

@@ -24,7 +24,7 @@ class TestInline < MiniTest::Unit::TestCase
     class InlineWorkerWithTimeParam
       include Sidekiq::Worker
       def perform(time)
-        raise ParameterIsNotString unless time.is_a?(String)
+        raise ParameterIsNotString unless time.is_a?(String) || time.is_a?(Numeric)
       end
     end
 

data/test/test_web.rb

@@ -148,6 +148,15 @@ class TestWeb < MiniTest::Unit::TestCase
       assert_match /#{msg['args'][2]}/, last_response.body
     end
 
+    it 'can show user defined tab' do
+      Sidekiq::Web.tabs << 'Custom Tab'
+
+      get '/'
+      assert_match 'Custom Tab', last_response.body
+
+      Sidekiq::Web.tabs.delete 'Custom Tab'
+    end
+
     def add_scheduled
       msg = { 'class' => 'HardWorker',
               'args' => ['bob', 1, Time.now.to_f],

data/web/assets/javascripts/application.js

@@ -20,6 +20,8 @@ $(function() {
 });
 
 $(function() {
+  function pad(n) { return ('0' + n).slice(-2); }
+
   $('a[name=poll]').data('polling', false);
 
   $('a[name=poll]').on('click', function(e) {
@@ -39,7 +41,7 @@ $(function() {
           $('.workers').replaceWith(responseHtml.find('.workers'));
         });
         var currentTime = new Date();
-        $('.poll-status').text('Last polled at: ' + currentTime.getHours() + ':' + currentTime.getMinutes() + ':' + currentTime.getSeconds());
+        $('.poll-status').text('Last polled at: ' + currentTime.getHours() + ':' + pad(currentTime.getMinutes()) + ':' + pad(currentTime.getSeconds()));
       }, 2000));
       $('.poll-status').text('Starting to poll...');
       pollLink.text('Stop Polling');

data/web/views/_workers.slim

@@ -11,4 +11,4 @@ table class="table table-striped table-bordered workers"
       td= msg['queue']
       td= msg['payload']['class']
       td= msg['payload']['args'].inspect[0..100]
-      td== relative_time(Time.parse(msg['run_at']))
+      td== relative_time(msg['run_at'].is_a?(Numeric) ? Time.at(msg['run_at']) : Time.parse(msg['run_at']))

data/web/views/layout.slim

@@ -17,12 +17,10 @@ html
             ul.nav
               li
                 a href='#{{root_path}}' Home
-              li
-                a href='#{{root_path}}queues' Queues
-              li
-                a href='#{{root_path}}retries' Retries
-              li
-                a href='#{{root_path}}scheduled' Scheduled
+              - tabs.each do |tab|
+                li
+                  a href='#{{root_path}}#{{tab.downcase}}': #{tab}
+
             ul.nav.pull-right
               li
                 a Redis: #{location}

data/web/views/retry.slim

@@ -22,11 +22,11 @@ header
           td= msg['retry_count']
         tr
           th Last Retry
-          td== relative_time(Time.parse(msg['retried_at']))
+          td== relative_time(msg['retried_at'].is_a?(Numeric) ? Time.at(msg['retried_at']) : Time.parse(msg['retried_at']))
       - else
         tr
           th Originally Failed
-          td== relative_time(Time.parse(msg['failed_at']))
+          td== relative_time(msg['failed_at'].is_a?(Numeric) ? Time.at(msg['failed_at']) : Time.parse(msg['failed_at']))
       tr
         th Next Retry
         td== relative_time(Time.at(@score))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-17 00:00:00.000000000 Z
+date: 2012-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis