sidekiq 2.0.2 → 2.0.3

data/Changes.md

@@ -1,3 +1,13 @@
+2.0.3
+-----------
+- Fix sidekiq-web's navbar on mobile devices and windows <= 980px (ezkl)
+- Fix Capistrano task for first deploys [#259]
+- Worker subclasses now properly inherit sidekiq\_options set in
+  their superclass [#221]
+- Add random jitter to scheduler to spread polls across POLL\_INTERVAL
+  window. [#247]
+- Add note in README about new mailing list: sidekiq@librelist.org
+
 2.0.2
 -----------
 

data/README.md

@@ -47,6 +47,10 @@ Please see the [sidekiq wiki](https://github.com/mperham/sidekiq/wiki) for more
 [#sidekiq on irc.freenode.net](irc://irc.freenode.net/#sidekiq) is dedicated to this project,
 but bug reports or feature requests suggestions should still go through [issues on Github](https://github.com/mperham/sidekiq/issues).
 
+There's also a mailing list via [Librelist](http://librelist.org) that you can subscribe to by sending
+and email to <sidekiq@librelist.org> with a greeting in the body. To unsubscribe, send an email to <sidekiq-unsubscribe@librelist.org> and that's it!
+Once archiving begins, you'll be able to visit [the archives](http://librelist.com/browser/sidekiq/) to see past threads.
+
 
 License
 -----------------

data/lib/sidekiq.rb

@@ -7,7 +7,7 @@ require 'sidekiq/util'
 
 require 'sidekiq/extensions/action_mailer'
 require 'sidekiq/extensions/active_record'
-require 'sidekiq/rails' if defined?(::Rails)
+require 'sidekiq/rails' if defined?(::Rails::Engine)
 
 require 'multi_json'
 

data/lib/sidekiq/capistrano.rb

@@ -11,12 +11,12 @@ Capistrano::Configuration.instance.load do
 
     desc "Quiet sidekiq (stop accepting new work)"
     task :quiet, :roles => lambda { fetch(:sidekiq_role) }, :on_no_matching_servers => :continue do
-      run "cd #{current_path} && if [ -f #{current_path}/tmp/pids/sidekiq.pid ]; then #{fetch(:bundle_cmd, "bundle")} exec sidekiqctl quiet #{current_path}/tmp/pids/sidekiq.pid ; fi"
+      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"
     end
 
     desc "Stop sidekiq"
     task :stop, :roles => lambda { fetch(:sidekiq_role) }, :on_no_matching_servers => :continue do
-      run "cd #{current_path} && if [ -f #{current_path}/tmp/pids/sidekiq.pid ]; then #{fetch(:bundle_cmd, "bundle")} exec sidekiqctl stop #{current_path}/tmp/pids/sidekiq.pid #{fetch :sidekiq_timeout} ; fi"
+      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"
     end
 
     desc "Start sidekiq"

data/lib/sidekiq/cli.rb

@@ -22,6 +22,8 @@ trap 'TTIN' do
   end
 end
 
+$stdout.sync = true
+
 require 'yaml'
 require 'singleton'
 require 'optparse'
@@ -69,7 +71,7 @@ module Sidekiq
       begin
         logger.info 'Starting processing, hit Ctrl-C to stop'
         @manager.start!
-        poller.poll!
+        poller.poll!(true)
         sleep
       rescue Interrupt
         logger.info 'Shutting down'

data/lib/sidekiq/core_ext.rb

@@ -0,0 +1,54 @@
+begin
+  require 'active_support/core_ext/class/attribute'
+rescue LoadError
+
+  # A dumbed down version of ActiveSupport's
+  # Class#class_attribute helper.
+  class Class
+    def class_attribute(*attrs)
+      instance_reader = true
+      instance_writer = true
+
+      attrs.each do |name|
+        class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          def self.#{name}() nil end
+          def self.#{name}?() !!#{name} end
+
+          def self.#{name}=(val)
+            singleton_class.class_eval do
+              define_method(:#{name}) { val }
+            end
+
+            if singleton_class?
+              class_eval do
+                def #{name}
+                  defined?(@#{name}) ? @#{name} : singleton_class.#{name}
+                end
+              end
+            end
+            val
+          end
+
+          if instance_reader
+            def #{name}
+              defined?(@#{name}) ? @#{name} : self.class.#{name}
+            end
+
+            def #{name}?
+              !!#{name}
+            end
+          end
+        RUBY
+
+        attr_writer name if instance_writer
+      end
+    end
+
+    private
+    def singleton_class?
+      ancestors.first != self
+    end
+  end
+end
+
+

data/lib/sidekiq/scheduled.rb

@@ -18,8 +18,10 @@ module Sidekiq
 
       SETS = %w(retry schedule)
 
-      def poll
+      def poll(first_time=false)
         watchdog('scheduling poller thread died!') do
+          add_jitter if first_time
+
           # A message's "score" in Redis is the time at which it should be processed.
           # Just check Redis for the set of messages with a timestamp before now.
           now = Time.now.to_f.to_s
@@ -42,6 +44,17 @@ module Sidekiq
         end
       end
 
+      private
+
+      def add_jitter
+        begin
+          sleep(POLL_INTERVAL * rand)
+        rescue Celluloid::Task::TerminatedError
+          # Hit Ctrl-C when Sidekiq is finished booting and we have a chance
+          # to get here.
+        end
+      end
+
     end
   end
 end

data/lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 end

data/lib/sidekiq/web.rb

@@ -179,7 +179,7 @@ module Sidekiq
         s = score.to_f
         process_score('schedule', s, :delete)
       end
-      redirect root_path
+      redirect "#{root_path}scheduled"
     end
 
     post '/retries' do
@@ -192,7 +192,7 @@ module Sidekiq
           process_score('retry', s, :delete)
         end
       end
-      redirect root_path
+      redirect "#{root_path}retries"
     end
 
     post "/retries/:score" do
@@ -203,7 +203,7 @@ module Sidekiq
       elsif params['delete']
         process_score('retry', score, :delete)
       end
-      redirect root_path
+      redirect "#{root_path}retries"
     end
 
     def process_score(set, score, operation)

data/lib/sidekiq/worker.rb

@@ -1,4 +1,5 @@
 require 'sidekiq/client'
+require 'sidekiq/core_ext'
 
 module Sidekiq
 
@@ -22,6 +23,7 @@ module Sidekiq
   module Worker
     def self.included(base)
       base.extend(ClassMethods)
+      base.class_attribute :sidekiq_options_hash
     end
 
     def logger
@@ -51,11 +53,13 @@ module Sidekiq
       #   :backtrace - whether to save any error backtrace in the retry payload to display in web UI,
       #      can be true, false or an integer number of lines to save, default *false*
       def sidekiq_options(opts={})
-        @sidekiq_options = get_sidekiq_options.merge(stringify_keys(opts || {}))
+        self.sidekiq_options_hash = get_sidekiq_options.merge(stringify_keys(opts || {}))
       end
 
+      DEFAULT_OPTIONS = { 'unique' => true, 'retry' => true, 'queue' => 'default' }
+
       def get_sidekiq_options # :nodoc:
-        defined?(@sidekiq_options) ? @sidekiq_options : { 'unique' => true, 'retry' => true, 'queue' => 'default' }
+        self.sidekiq_options_hash ||= DEFAULT_OPTIONS
       end
 
       def stringify_keys(hash) # :nodoc:

data/sidekiq.gemspec

@@ -6,6 +6,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["mperham@gmail.com"]
   gem.description   = gem.summary = "Simple, efficient message processing for Ruby"
   gem.homepage      = "http://mperham.github.com/sidekiq"
+  gem.license       = "LGPL-3.0"
 
   gem.executables   = ['sidekiq', 'sidekiqctl']
   gem.files         = `git ls-files`.split("\n")

data/test/test_client.rb

@@ -73,6 +73,10 @@ class TestClient < MiniTest::Unit::TestCase
       include Sidekiq::Worker
     end
 
+    it 'has default options' do
+      assert_equal Sidekiq::Worker::ClassMethods::DEFAULT_OPTIONS, MyWorker.get_sidekiq_options
+    end
+
     it 'handles perform_async' do
       @redis.expect :rpush, 1, ['queue:default', String]
       pushed = MyWorker.perform_async(1, 2)
@@ -116,4 +120,22 @@ class TestClient < MiniTest::Unit::TestCase
       assert_equal ['bob'], Sidekiq::Client.registered_workers
     end
   end
+
+  class BaseWorker
+    include Sidekiq::Worker
+    sidekiq_options 'retry' => 'base'
+  end
+  class AWorker < BaseWorker
+  end
+  class BWorker < BaseWorker
+    sidekiq_options 'retry' => 'b'
+  end
+
+  describe 'inheritance' do
+    it 'should inherit sidekiq options' do
+      assert_equal 'base', AWorker.get_sidekiq_options['retry']
+      assert_equal 'b', BWorker.get_sidekiq_options['retry']
+    end
+  end
+
 end

data/test/test_web.rb

@@ -81,6 +81,17 @@ class TestWeb < MiniTest::Unit::TestCase
       assert_match /HardWorker/, last_response.body
     end
 
+    it 'can delete scheduled' do
+      msg,score = add_scheduled
+      Sidekiq.redis do |conn|
+        assert_equal 1, conn.zcard('schedule')
+        post '/scheduled', 'score' => [score], 'delete' => 'Delete'
+        assert_equal 302, last_response.status
+        assert_equal 'http://example.org/scheduled', last_response.header['Location']
+        assert_equal 0, conn.zcard('schedule')
+      end
+    end
+
     it 'can display retries' do
       get '/retries'
       assert_equal 200, last_response.status
@@ -110,7 +121,7 @@ class TestWeb < MiniTest::Unit::TestCase
 
       post "/retries/#{score}", 'delete' => 'Delete'
       assert_equal 302, last_response.status
-      assert_equal 'http://example.org/', last_response.header['Location']
+      assert_equal 'http://example.org/retries', last_response.header['Location']
       
       get "/retries"
       assert_equal 200, last_response.status
@@ -122,7 +133,7 @@ class TestWeb < MiniTest::Unit::TestCase
 
       post "/retries/#{score}", 'retry' => 'Retry'
       assert_equal 302, last_response.status
-      assert_equal 'http://example.org/', last_response.header['Location']
+      assert_equal 'http://example.org/retries', last_response.header['Location']
       
       get '/queues/default'
       assert_equal 200, last_response.status

data/web/assets/stylesheets/application.css

@@ -1,27 +1,6 @@
 /*
 *= require vendor/bootstrap
+*= require layout
 *= require vendor/bootstrap-responsive
 *= require_self
 */
-body {
-  position: relative;
-  padding-top: 90px;
-}
-
-td form {
-  margin: 0;
-}
-
-td form .btn {
-  margin: 0;
-}
-
-code {
-  padding: 0;
-  border: 0;
-  background-color: inherit;
-}
-
-.hero-unit {
-  padding: 30px;
-}

data/web/assets/stylesheets/layout.css

@@ -0,0 +1,22 @@
+body {
+  position: relative;
+  padding-top: 90px;
+}
+
+td form {
+  margin: 0;
+}
+
+td form .btn {
+  margin: 0;
+}
+
+code {
+  padding: 0;
+  border: 0;
+  background-color: inherit;
+}
+
+.hero-unit {
+  padding: 30px;
+}

data/web/views/layout.slim

@@ -7,22 +7,27 @@ html
     .navbar.navbar-fixed-top
       .navbar-inner
         .container
+          a.btn.btn-navbar data-toggle="collapse" data-target=".nav-collapse"
+            span.icon-bar
+            span.icon-bar
+            span.icon-bar
           a.brand href='#{{root_path}}'
             | Sidekiq
-          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
-          ul.nav.pull-right
-            li
-              a Redis: #{location}
-            li
-              a #{Time.now.utc}
+          div.nav-collapse  
+            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
+            ul.nav.pull-right
+              li
+                a Redis: #{location}
+              li
+                a #{Time.now.utc}
 
     .container
       == yield

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-13 00:00:00.000000000 Z
+date: 2012-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70093698877540 !ruby/object:Gem::Requirement
+  requirement: &70268588228240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *70093698877540
+  version_requirements: *70268588228240
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70093698876900 !ruby/object:Gem::Requirement
+  requirement: &70268588227780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70093698876900
+  version_requirements: *70268588227780
 - !ruby/object:Gem::Dependency
   name: connection_pool
-  requirement: &70093698876280 !ruby/object:Gem::Requirement
+  requirement: &70268588227180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70093698876280
+  version_requirements: *70268588227180
 - !ruby/object:Gem::Dependency
   name: celluloid
-  requirement: &70093698875780 !ruby/object:Gem::Requirement
+  requirement: &70268588226500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.11.0
   type: :runtime
   prerelease: false
-  version_requirements: *70093698875780
+  version_requirements: *70268588226500
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70093698891660 !ruby/object:Gem::Requirement
+  requirement: &70268588225840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1'
   type: :runtime
   prerelease: false
-  version_requirements: *70093698891660
+  version_requirements: *70268588225840
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70093698891180 !ruby/object:Gem::Requirement
+  requirement: &70268588225120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *70093698891180
+  version_requirements: *70268588225120
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70093698890800 !ruby/object:Gem::Requirement
+  requirement: &70268588224740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70093698890800
+  version_requirements: *70268588224740
 - !ruby/object:Gem::Dependency
   name: slim
-  requirement: &70093698890340 !ruby/object:Gem::Requirement
+  requirement: &70268588224280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70093698890340
+  version_requirements: *70268588224280
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70093698889860 !ruby/object:Gem::Requirement
+  requirement: &70268588223740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70093698889860
+  version_requirements: *70268588223740
 - !ruby/object:Gem::Dependency
   name: actionmailer
-  requirement: &70093698889320 !ruby/object:Gem::Requirement
+  requirement: &70268588223240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *70093698889320
+  version_requirements: *70268588223240
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70093698888640 !ruby/object:Gem::Requirement
+  requirement: &70268588222720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,7 +131,7 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *70093698888640
+  version_requirements: *70268588222720
 description: Simple, efficient message processing for Ruby
 email:
 - mperham@gmail.com
@@ -169,6 +169,7 @@ files:
 - lib/sidekiq/capistrano.rb
 - lib/sidekiq/cli.rb
 - lib/sidekiq/client.rb
+- lib/sidekiq/core_ext.rb
 - lib/sidekiq/extensions/action_mailer.rb
 - lib/sidekiq/extensions/active_record.rb
 - lib/sidekiq/extensions/generic_proxy.rb
@@ -269,6 +270,7 @@ files:
 - web/assets/javascripts/vendor/jquery.js
 - web/assets/javascripts/vendor/jquery.timeago.js
 - web/assets/stylesheets/application.css
+- web/assets/stylesheets/layout.css
 - web/assets/stylesheets/vendor/bootstrap-responsive.css
 - web/assets/stylesheets/vendor/bootstrap.css
 - web/views/index.slim
@@ -279,7 +281,8 @@ files:
 - web/views/retry.slim
 - web/views/scheduled.slim
 homepage: http://mperham.github.com/sidekiq
-licenses: []
+licenses:
+- LGPL-3.0
 post_install_message: 
 rdoc_options: []
 require_paths: