sidekiq 2.0.1 → 2.0.2

data/Changes.md

@@ -1,3 +1,8 @@
+2.0.2
+-----------
+
+- Fix "Retry Now" button on individual retry page. (ezkl)
+
 2.0.1
 -----------
 

data/lib/sidekiq/processor.rb

@@ -8,6 +8,10 @@ require 'sidekiq/middleware/server/logging'
 require 'sidekiq/middleware/server/timeout'
 
 module Sidekiq
+  ##
+  # The Processor receives a message from the Manager and actually
+  # processes it.  It instantiates the worker, runs the middleware
+  # chain and then calls Sidekiq::Worker#perform.
   class Processor
     include Util
     include Celluloid
@@ -29,6 +33,11 @@ module Sidekiq
     def process(msg, queue)
       klass  = constantize(msg['class'])
       worker = klass.new
+
+      # Celluloid actor calls are performed within a Fiber.
+      # This would give us a terribly small 4KB stack on MRI
+      # so we use Celluloid's defer to run things in a thread pool
+      # in order to get a full-sized stack for the Worker.
       defer do
         stats(worker, msg, queue) do
           Sidekiq.server_middleware.invoke(worker, msg, queue) do

data/lib/sidekiq/version.rb

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

data/lib/sidekiq/web.rb

@@ -128,6 +128,11 @@ module Sidekiq
       slim :index
     end
 
+    get "/queues" do
+      @queues = queues
+      slim :queues
+    end
+
     get "/queues/:name" do
       halt 404 unless params[:name]
       count = (params[:count] || 10).to_i
@@ -146,7 +151,7 @@ module Sidekiq
         conn.del("queue:#{params[:name]}")
         conn.srem("queues", params[:name])
       end
-      redirect root_path
+      redirect "#{root_path}queues"
     end
 
     get "/retries/:score" do
@@ -194,9 +199,9 @@ module Sidekiq
       halt 404 unless params[:score]
       score = params[:score].to_f
       if params['retry']
-        process_score(score, :retry)
+        process_score('retry', score, :retry)
       elsif params['delete']
-        process_score(score, :delete)
+        process_score('retry', score, :delete)
       end
       redirect root_path
     end

data/myapp/app/workers/hard_worker.rb

@@ -1,6 +1,6 @@
 class HardWorker
   include Sidekiq::Worker
-  sidekiq_options :timeout => 60, :backtrace => 5, :timeout => 20
+  sidekiq_options :timeout => 20, :backtrace => 5
 
   def perform(name, count, salt)
     raise name if name == 'crash'

data/test/test_web.rb

@@ -24,33 +24,20 @@ class TestWeb < MiniTest::Unit::TestCase
       end
     end
 
-    it 'shows active queues' do
+    it 'can display home' do
       get '/'
       assert_equal 200, last_response.status
       assert_match /Sidekiq is idle/, last_response.body
       refute_match /default/, last_response.body
+    end
 
-      assert WebWorker.perform_async(1, 2)
-
-      get '/'
-      assert_equal 200, last_response.status
-      assert_match /Sidekiq is idle/, last_response.body
-      assert_match /default/, last_response.body
-      refute_match /foo/, last_response.body
-
+    it 'can display queues' do
       assert Sidekiq::Client.push('queue' => :foo, 'class' => WebWorker, 'args' => [1, 3])
 
-      get '/'
+      get '/queues'
       assert_equal 200, last_response.status
-      assert_match /Sidekiq is idle/, last_response.body
-      assert_match /default/, last_response.body
       assert_match /foo/, last_response.body
-      assert_match /Backlog: 2/, last_response.body
-    end
-
-    it 'handles queues with no name' do
-      get '/queues'
-      assert_equal 404, last_response.status
+      refute_match /HardWorker/, last_response.body
     end
 
     it 'handles missing retry' do
@@ -117,6 +104,30 @@ class TestWeb < MiniTest::Unit::TestCase
       assert_equal 200, last_response.status
       assert_match /HardWorker/, last_response.body
     end
+    
+    it 'can delete a single retry' do
+      _, score = add_retry
+
+      post "/retries/#{score}", 'delete' => 'Delete'
+      assert_equal 302, last_response.status
+      assert_equal 'http://example.org/', last_response.header['Location']
+      
+      get "/retries"
+      assert_equal 200, last_response.status
+      refute_match /#{score}/, last_response.body
+    end
+    
+    it 'can retry a single retry now' do
+      msg, score = add_retry
+
+      post "/retries/#{score}", 'retry' => 'Retry'
+      assert_equal 302, last_response.status
+      assert_equal 'http://example.org/', last_response.header['Location']
+      
+      get '/queues/default'
+      assert_equal 200, last_response.status
+      assert_match /#{msg['args'][2]}/, last_response.body
+    end
 
     def add_scheduled
       msg = { 'class' => 'HardWorker',

data/web/views/index.slim

@@ -1,4 +1,3 @@
-
 .hero-unit
   h1 Sidekiq is #{current_status}
   p Processed: #{processed}
@@ -8,44 +7,19 @@
   p Retries Pending: #{zcard('retry')}
   p Queue Backlog: #{backlog}
 
-.tabbable
-  ul.nav.nav-tabs
-    li.active
-      a href="#workers" data-toggle="tab" Busy Workers
-    li
-      a href="#queues" data-toggle="tab" Queues
-  .tab-content
-    #workers.tab-pane.active
-      table class="table table-striped table-bordered"
-        tr
-          th Worker
-          th Queue
-          th Class
-          th Arguments
-          th Started
-        - workers.each do |(worker, msg)|
-          tr
-            td= worker
-            td= msg['queue']
-            td= msg['payload']['class']
-            td= msg['payload']['args'].inspect[0..100]
-            td== relative_time(Time.parse(msg['run_at']))
-      form action="#{root_path}reset" method="post"
-         button.btn type="submit" title="If you kill -9 Sidekiq, this table can fill up with old data." Clear worker list
-
-    #queues.tab-pane
-      table class="table table-striped table-bordered"
-        tr
-          th Queue
-          th Size
-          th
-        - queues.each do |(queue, size)|
-          tr
-            td
-              a href="#{root_path}queues/#{queue}" #{queue}
-            td= size
-            td
-              form action="#{root_path}queues/#{queue}" method="post"
-                input.btn.btn-danger type="submit" name="delete" value="Delete"
-
-
+table class="table table-striped table-bordered"
+  tr
+    th Worker
+    th Queue
+    th Class
+    th Arguments
+    th Started
+  - workers.each do |(worker, msg)|
+    tr
+      td= worker
+      td= msg['queue']
+      td= msg['payload']['class']
+      td= msg['payload']['args'].inspect[0..100]
+      td== relative_time(Time.parse(msg['run_at']))
+form action="#{root_path}reset" method="post"
+   button.btn type="submit" title="If you kill -9 Sidekiq, this table can fill up with old data." Clear worker list

data/web/views/layout.slim

@@ -12,6 +12,8 @@ html
           ul.nav
             li
               a href='#{{root_path}}' Home
+            li
+              a href='#{{root_path}}queues' Queues
             li
               a href='#{{root_path}}retries' Retries
             li

data/web/views/queues.slim

@@ -0,0 +1,19 @@
+h1 Queues
+
+- if @queues.size > 0
+  table class="table table-striped table-bordered"
+    tr
+      th Queue
+      th Size
+      th
+    - queues.each do |(queue, size)|
+      tr
+        td
+          a href="#{root_path}queues/#{queue}" #{queue}
+        td= size
+        td
+          form action="#{root_path}queues/#{queue}" method="post"
+            input.btn.btn-danger type="submit" name="delete" value="Delete"
+- else
+  p No queues found.
+  a href="#{root_path}" Back

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-06 00:00:00.000000000 Z
+date: 2012-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70196173811640 !ruby/object:Gem::Requirement
+  requirement: &70093698877540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *70196173811640
+  version_requirements: *70093698877540
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70196173810860 !ruby/object:Gem::Requirement
+  requirement: &70093698876900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70196173810860
+  version_requirements: *70093698876900
 - !ruby/object:Gem::Dependency
   name: connection_pool
-  requirement: &70196173808820 !ruby/object:Gem::Requirement
+  requirement: &70093698876280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70196173808820
+  version_requirements: *70093698876280
 - !ruby/object:Gem::Dependency
   name: celluloid
-  requirement: &70196173808020 !ruby/object:Gem::Requirement
+  requirement: &70093698875780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.11.0
   type: :runtime
   prerelease: false
-  version_requirements: *70196173808020
+  version_requirements: *70093698875780
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70196173807440 !ruby/object:Gem::Requirement
+  requirement: &70093698891660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1'
   type: :runtime
   prerelease: false
-  version_requirements: *70196173807440
+  version_requirements: *70093698891660
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70196173806860 !ruby/object:Gem::Requirement
+  requirement: &70093698891180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *70196173806860
+  version_requirements: *70093698891180
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70196173806360 !ruby/object:Gem::Requirement
+  requirement: &70093698890800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70196173806360
+  version_requirements: *70093698890800
 - !ruby/object:Gem::Dependency
   name: slim
-  requirement: &70196173805420 !ruby/object:Gem::Requirement
+  requirement: &70093698890340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70196173805420
+  version_requirements: *70093698890340
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70196173804720 !ruby/object:Gem::Requirement
+  requirement: &70093698889860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70196173804720
+  version_requirements: *70093698889860
 - !ruby/object:Gem::Dependency
   name: actionmailer
-  requirement: &70196173803700 !ruby/object:Gem::Requirement
+  requirement: &70093698889320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *70196173803700
+  version_requirements: *70093698889320
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70196173802600 !ruby/object:Gem::Requirement
+  requirement: &70093698888640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,7 +131,7 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *70196173802600
+  version_requirements: *70093698888640
 description: Simple, efficient message processing for Ruby
 email:
 - mperham@gmail.com
@@ -274,6 +274,7 @@ files:
 - web/views/index.slim
 - web/views/layout.slim
 - web/views/queue.slim
+- web/views/queues.slim
 - web/views/retries.slim
 - web/views/retry.slim
 - web/views/scheduled.slim