sidekiq 2.12.4 → 2.13.0

data/Changes.md

@@ -1,3 +1,27 @@
+2.13.0
+-----------
+- Adding button to move scheduled job to main queue [guiceolin, #1020]
+- fix i18n support resetting saved locale when job is retried [#1011]
+- log rotation via USR2 now closes the old logger [#1008]
+- Add ability to customize retry schedule, like so [jmazzi, #1027]
+
+```ruby
+class MyWorker
+  include Sidekiq::Worker
+  sidekiq_retry_in { |count| count * 2 }
+end
+```
+- Redesign Worker#retries\_exhausted callback to use same form as above [jmazzi, #1030]
+
+```ruby
+class MyWorker
+  include Sidekiq::Worker
+  sidekiq_retries_exhausted do |msg|
+    Rails.logger.error "Failed to process #{msg['class']} with args: #{msg['args']}"
+  end
+end
+```
+
 2.12.4
 -----------
 

data/README.md

@@ -4,16 +4,16 @@ Sidekiq
 [![Gem Version](https://badge.fury.io/rb/sidekiq.png)](https://rubygems.org/gems/sidekiq) [![Code Climate](https://codeclimate.com/github/mperham/sidekiq.png)](https://codeclimate.com/github/mperham/sidekiq) [![Build Status](https://travis-ci.org/mperham/sidekiq.png)](https://travis-ci.org/mperham/sidekiq) [![Coverage Status](https://coveralls.io/repos/mperham/sidekiq/badge.png?branch=master)](https://coveralls.io/r/mperham/sidekiq)
 
 
-Simple, efficient message processing for Ruby.
+Simple, efficient background processing for Ruby.
 
-Sidekiq uses threads to handle many messages at the same time in the
+Sidekiq uses threads to handle many jobs at the same time in the
 same process.  It does not require Rails but will integrate tightly with
-Rails 3 to make background message processing dead simple.
+Rails 3 to make background processing dead simple.
 
 Sidekiq is compatible with Resque.  It uses the exact same
 message format as Resque so it can integrate into an existing Resque processing farm.
 You can have Sidekiq and Resque run side-by-side at the same time and
-use the Resque client to enqueue messages in Redis to be processed by Sidekiq.
+use the Resque client to enqueue jobs in Redis to be processed by Sidekiq.
 
 At the same time, Sidekiq uses multithreading so it is much more memory efficient than
 Resque (which forks a new process for every job).  You'll find that you might need

data/lib/sidekiq/api.rb

@@ -139,7 +139,7 @@ module Sidekiq
     def clear
       Sidekiq.redis do |conn|
         conn.multi do
-          conn.del("queue:#{name}")
+          conn.del(@rname)
           conn.srem("queues", name)
         end
       end
@@ -222,6 +222,17 @@ module Sidekiq
       @parent.schedule(at, item)
     end
 
+    def add_to_queue
+      Sidekiq.redis do |conn|
+        results = conn.zrangebyscore('schedule', score, score)
+        conn.zremrangebyscore('schedule', score, score)
+        results.map do |message|
+          msg = Sidekiq.load_json(message)
+          Sidekiq::Client.push(msg)
+        end
+      end
+    end
+
     def retry
       raise "Retry not available on jobs not in the Retry queue." unless item["failed_at"]
       Sidekiq.redis do |conn|

data/lib/sidekiq/logging.rb

@@ -26,9 +26,11 @@ module Sidekiq
     end
 
     def self.initialize_logger(log_target = STDOUT)
+      oldlogger = @logger
       @logger = Logger.new(log_target)
       @logger.level = Logger::INFO
       @logger.formatter = Pretty.new
+      oldlogger.close if oldlogger && !$TESTING # don't want to close testing's STDOUT logging
       @logger
     end
 

data/lib/sidekiq/middleware/i18n.rb

@@ -3,7 +3,7 @@ module Sidekiq::Middleware::I18n
   # to be sent to Sidekiq.
   class Client
     def call(worker_class, msg, queue)
-      msg['locale'] = I18n.locale
+      msg['locale'] ||= I18n.locale
       yield
     end
   end

data/lib/sidekiq/middleware/server/retry_jobs.rb

@@ -78,7 +78,7 @@ module Sidekiq
           end
 
           if count < max_retry_attempts
-            delay = seconds_to_delay(count)
+            delay = delay_for(worker, count)
             logger.debug { "Failure! Retry #{count} in #{delay} seconds" }
             retry_at = Time.now.to_f + delay
             payload = Sidekiq.dump_json(msg)
@@ -95,7 +95,12 @@ module Sidekiq
 
         def retries_exhausted(worker, msg)
           logger.debug { "Dropping message after hitting the retry maximum: #{msg}" }
-          worker.retries_exhausted(*msg['args']) if worker.respond_to?(:retries_exhausted)
+          if worker.respond_to?(:retries_exhausted)
+            logger.warn { "Defining #{worker.class.name}#retries_exhausted as a method is deprecated, use `sidekiq_retries_exhausted` callback instead http://git.io/Ijju8g" }
+            worker.retries_exhausted(*msg['args'])
+          elsif worker.sidekiq_retries_exhausted_block?
+            worker.sidekiq_retries_exhausted_block.call(msg)
+          end
 
         rescue Exception => e
           handle_exception(e, "Error calling retries_exhausted")
@@ -109,11 +114,24 @@ module Sidekiq
           end
         end
 
+        def delay_for(worker, count)
+          worker.sidekiq_retry_in_block? && retry_in(worker, count) || seconds_to_delay(count)
+        end
+
         # delayed_job uses the same basic formula
         def seconds_to_delay(count)
           (count ** 4) + 15 + (rand(30)*(count+1))
         end
 
+        def retry_in(worker, count)
+          begin
+            worker.sidekiq_retry_in_block.call(count)
+          rescue Exception => e
+            logger.error { "Failure scheduling retry using the defined `sidekiq_retry_in` in #{worker.class.name}, falling back to default: #{e.message}"}
+            nil
+          end
+        end
+
       end
     end
   end

data/lib/sidekiq/testing.rb

@@ -86,7 +86,9 @@ module Sidekiq
       # Drain and run all jobs for this worker
       def drain
         while job = jobs.shift do
-          new.perform(*job['args'])
+          worker = new
+          worker.jid = job['jid']
+          worker.perform(*job['args'])
         end
       end
 
@@ -94,7 +96,9 @@ module Sidekiq
       def perform_one
         raise(EmptyQueueError, "perform_one called with empty job queue") if jobs.empty?
         job = jobs.shift
-        new.perform(*job['args'])
+        worker = new
+        worker.jid = job['jid']
+        worker.perform(*job['args'])
       end
     end
 

data/lib/sidekiq/util.rb

@@ -26,7 +26,7 @@ module Sidekiq
     end
 
     def process_id
-      Process.pid
+      @@process_id ||= SecureRandom.hex
     end
 
     def hostname

data/lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "2.12.4"
+  VERSION = "2.13.0"
 end

data/lib/sidekiq/web.rb

@@ -41,7 +41,13 @@ module Sidekiq
       def reset_worker_list
         Sidekiq.redis do |conn|
           workers = conn.smembers('workers')
-          conn.srem('workers', *workers)
+          conn.srem('workers', workers) if !workers.empty?
+        end
+      end
+
+      def workers_size
+        Sidekiq.redis do |conn|
+          conn.scard('workers')
         end
       end
 
@@ -84,7 +90,7 @@ module Sidekiq
       end
 
       def current_status
-        return 'idle' if workers.size == 0
+        return 'idle' if workers_size == 0
         return 'active'
       end
 
@@ -245,9 +251,14 @@ module Sidekiq
 
     post '/scheduled' do
       halt 404 unless params['key']
-      halt 404 unless params['delete']
+
       params['key'].each do |key|
-        Sidekiq::ScheduledSet.new.fetch(*parse_params(key)).first.delete
+        job = Sidekiq::ScheduledSet.new.fetch(*parse_params(key)).first
+        if params['delete']
+          job.delete
+        elsif params['add_to_queue']
+          job.add_to_queue
+        end
       end
       redirect "#{root_path}scheduled"
     end
@@ -269,7 +280,7 @@ module Sidekiq
         sidekiq: {
           processed:  sidekiq_stats.processed,
           failed:     sidekiq_stats.failed,
-          busy:       workers.size,
+          busy:       workers_size,
           enqueued:   sidekiq_stats.enqueued,
           scheduled:  sidekiq_stats.scheduled_size,
           retries:    sidekiq_stats.retry_size,
@@ -285,4 +296,3 @@ module Sidekiq
   end
 
 end
-

data/lib/sidekiq/worker.rb

@@ -26,6 +26,8 @@ module Sidekiq
     def self.included(base)
       base.extend(ClassMethods)
       base.class_attribute :sidekiq_options_hash
+      base.class_attribute :sidekiq_retry_in_block
+      base.class_attribute :sidekiq_retries_exhausted_block
     end
 
     def logger
@@ -40,8 +42,15 @@ module Sidekiq
 
       def perform_in(interval, *args)
         int = interval.to_f
-        ts = (int < 1_000_000_000 ? Time.now.to_f + int : int)
-        client_push('class' => self, 'args' => args, 'at' => ts)
+        now = Time.now.to_f
+        ts = (int < 1_000_000_000 ? now + int : int)
+
+        # Optimization to enqueue something now that is scheduled to go out now or in the past
+        if ts <= now
+          perform_async(*args)
+        else
+          client_push('class' => self, 'args' => args, 'at' => ts)
+        end
       end
       alias_method :perform_at, :perform_in
 
@@ -58,6 +67,14 @@ module Sidekiq
         ::Sidekiq.logger.warn("#{self.name} - :timeout is unsafe and support has been removed from Sidekiq, see http://bit.ly/OtYpK for details") if opts.include? :timeout
       end
 
+      def sidekiq_retry_in(&block)
+        self.sidekiq_retry_in_block = block
+      end
+
+      def sidekiq_retries_exhausted(&block)
+        self.sidekiq_retries_exhausted_block = block
+      end
+
       DEFAULT_OPTIONS = { 'retry' => true, 'queue' => 'default' }
 
       def get_sidekiq_options # :nodoc:

data/sidekiq.gemspec

@@ -4,7 +4,7 @@ require File.expand_path('../lib/sidekiq/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ["Mike Perham"]
   gem.email         = ["mperham@gmail.com"]
-  gem.description   = gem.summary = "Simple, efficient message processing for Ruby"
+  gem.description   = gem.summary = "Simple, efficient background processing for Ruby"
   gem.homepage      = "http://sidekiq.org"
   gem.license       = "LGPL-3.0"
 

data/test/test_api.rb

@@ -172,6 +172,18 @@ class TestApi < Minitest::Test
       assert_equal 0, q.size
     end
 
+    it "can move scheduled job to queue" do
+      job_id = ApiWorker.perform_in(100, 1, 'jason')
+      job = Sidekiq::ScheduledSet.new.find_job(job_id)
+      q = Sidekiq::Queue.new
+      job.add_to_queue
+      queued_job = q.find_job(job_id)
+      refute_nil queued_job
+      assert_equal queued_job.jid, job_id
+      job = Sidekiq::ScheduledSet.new.find_job(job_id)
+      assert_nil job
+    end
+
     it 'can find job by id in sorted sets' do
       job_id = ApiWorker.perform_in(100, 1, 'jason')
       job = Sidekiq::ScheduledSet.new.find_job(job_id)

data/test/test_retry.rb

@@ -12,12 +12,18 @@ class TestRetry < Minitest::Test
       def @redis.with; yield self; end
     end
 
+    let(:worker) do
+      Class.new do
+        include ::Sidekiq::Worker
+      end
+    end
+
     it 'allows disabling retry' do
       msg = { 'class' => 'Bob', 'args' => [1,2,'foo'], 'retry' => false }
       msg2 = msg.dup
       handler = Sidekiq::Middleware::Server::RetryJobs.new
       assert_raises RuntimeError do
-        handler.call('', msg2, 'default') do
+        handler.call(worker, msg2, 'default') do
           raise "kerblammo!"
         end
       end
@@ -30,7 +36,7 @@ class TestRetry < Minitest::Test
       msg2 = msg.dup
       handler = Sidekiq::Middleware::Server::RetryJobs.new
       assert_raises RuntimeError do
-        handler.call('', msg2, 'default') do
+        handler.call(worker, msg2, 'default') do
           raise "kerblammo!"
         end
       end
@@ -45,7 +51,7 @@ class TestRetry < Minitest::Test
       handler = Sidekiq::Middleware::Server::RetryJobs.new
       c = nil
       assert_raises RuntimeError do
-        handler.call('', msg, 'default') do
+        handler.call(worker, msg, 'default') do
           c = caller(0); raise "kerblammo!"
         end
       end
@@ -60,7 +66,7 @@ class TestRetry < Minitest::Test
       handler = Sidekiq::Middleware::Server::RetryJobs.new
       c = nil
       assert_raises RuntimeError do
-        handler.call('', msg, 'default') do
+        handler.call(worker, msg, 'default') do
           c = caller(0)[0..3]; raise "kerblammo!"
         end
       end
@@ -73,7 +79,7 @@ class TestRetry < Minitest::Test
       msg = { 'class' => 'Bob', 'args' => [1,2,'foo'], 'retry' => true }
       handler = Sidekiq::Middleware::Server::RetryJobs.new
       assert_raises RuntimeError do
-        handler.call('', msg, 'default') do
+        handler.call(worker, msg, 'default') do
           raise "kerblammo!"
         end
       end
@@ -91,7 +97,7 @@ class TestRetry < Minitest::Test
       msg = { 'class' => 'Bob', 'args' => [1,2,'foo'], 'retry' => true, 'retry_queue' => 'retry' }
       handler = Sidekiq::Middleware::Server::RetryJobs.new
       assert_raises RuntimeError do
-        handler.call('', msg, 'default') do
+        handler.call(worker, msg, 'default') do
           raise "kerblammo!"
         end
       end
@@ -110,7 +116,7 @@ class TestRetry < Minitest::Test
       msg = {"class"=>"Bob", "args"=>[1, 2, "foo"], 'retry' => true, "queue"=>"default", "error_message"=>"kerblammo!", "error_class"=>"RuntimeError", "failed_at"=>now, "retry_count"=>10}
       handler = Sidekiq::Middleware::Server::RetryJobs.new
       assert_raises RuntimeError do
-        handler.call('', msg, 'default') do
+        handler.call(worker, msg, 'default') do
           raise "kerblammo!"
         end
       end
@@ -128,7 +134,7 @@ class TestRetry < Minitest::Test
       msg = {"class"=>"Bob", "args"=>[1, 2, "foo"], 'retry' => 10, "queue"=>"default", "error_message"=>"kerblammo!", "error_class"=>"RuntimeError", "failed_at"=>now, "retry_count"=>8}
       handler = Sidekiq::Middleware::Server::RetryJobs.new
       assert_raises RuntimeError do
-        handler.call('', msg, 'default') do
+        handler.call(worker, msg, 'default') do
           raise "kerblammo!"
         end
       end
@@ -146,7 +152,7 @@ class TestRetry < Minitest::Test
       @redis.expect :zadd, 1, [ 'retry', String, String ]
       handler = Sidekiq::Middleware::Server::RetryJobs.new
       assert_raises RuntimeError do
-        handler.call('', msg, 'default') do
+        handler.call(worker, msg, 'default') do
           raise "kerblammo!"
         end
       end
@@ -160,7 +166,7 @@ class TestRetry < Minitest::Test
       @redis.expect :zadd, 1, [ 'retry', String, String ]
       handler = Sidekiq::Middleware::Server::RetryJobs.new
       assert_raises RuntimeError do
-        handler.call('', msg, 'default') do
+        handler.call(worker, msg, 'default') do
           raise "kerblammo!"
         end
       end
@@ -169,14 +175,45 @@ class TestRetry < Minitest::Test
     end
 
     describe "retry exhaustion" do
-      let(:worker){ Minitest::Mock.new }
       let(:handler){ Sidekiq::Middleware::Server::RetryJobs.new }
+      let(:worker) { Minitest::Mock.new }
       let(:msg){ {"class"=>"Bob", "args"=>[1, 2, "foo"], "queue"=>"default", "error_message"=>"kerblammo!", "error_class"=>"RuntimeError", "failed_at"=>Time.now.utc, "retry"=>3, "retry_count"=>3} }
 
-      it 'calls worker retries_exhausted after too many retries' do
-        worker.expect(:retries_exhausted, true, [1,2,"foo"]) 
-        task_misbehaving_worker
-        worker.verify
+      describe "worker method" do
+        let(:worker) do
+          klass = Class.new do
+            include Sidekiq::Worker
+
+            def self.name; "Worker"; end
+
+            def retries_exhausted(*args)
+              args << "retried_method"
+            end
+          end
+        end
+
+        it 'calls worker.retries_exhausted after too many retries' do
+          assert_equal [1,2, "foo", "retried_method"], handler.retries_exhausted(worker.new, msg)
+        end
+      end
+
+      describe "worker block" do
+        let(:worker) do
+          Class.new do
+            include Sidekiq::Worker
+
+            sidekiq_retries_exhausted do |msg|
+              msg.tap {|m| m['called_by_callback'] = true }
+            end
+          end
+        end
+
+        it 'calls worker sidekiq_retries_exhausted_block after too many retries' do
+          new_msg      = handler.retries_exhausted(worker.new, msg)
+          expected_msg = msg.merge('called_by_callback' => true)
+
+          assert_equal expected_msg, new_msg, "sidekiq_retries_exhausted block not called"
+        end
       end
 
       it 'handles and logs retries_exhausted failures gracefully (drops them)' do
@@ -197,6 +234,56 @@ class TestRetry < Minitest::Test
         end
       end
     end
+
+    describe "custom retry delay" do
+      before do
+        @old_logger    = Sidekiq.logger
+        @tmp_log_path  = '/tmp/sidekiq-retries.log'
+        Sidekiq.logger = Logger.new(@tmp_log_path)
+      end
+
+      after do
+        Sidekiq.logger = @old_logger
+        Sidekiq.options.delete(:logfile)
+        File.unlink @tmp_log_path if File.exists?(@tmp_log_path)
+      end
+
+      let(:custom_worker) do
+        Class.new do
+          include ::Sidekiq::Worker
+
+          sidekiq_retry_in do |count|
+            count * 2
+          end
+        end
+      end
+
+      let(:error_worker) do
+        Class.new do
+          include ::Sidekiq::Worker
+
+          sidekiq_retry_in do |count|
+            count / 0
+          end
+        end
+      end
+
+      let(:handler) { Sidekiq::Middleware::Server::RetryJobs.new }
+
+      it "retries with a default delay" do
+        refute_equal 4, handler.delay_for(worker, 2)
+      end
+
+      it "retries with a custom delay" do
+        assert_equal 4, handler.delay_for(custom_worker, 2)
+      end
+
+      it "falls back to the default retry on exception" do
+        refute_equal 4, handler.delay_for(error_worker, 2)
+        assert_match(/Failure scheduling retry using the defined `sidekiq_retry_in`/,
+                     File.read(@tmp_log_path), 'Log entry missing for sidekiq_retry_in')
+      end
+    end
   end
 
 end

data/test/test_testing.rb

@@ -49,6 +49,7 @@ class TestTesting < Minitest::Test
     before do
       load 'sidekiq/testing.rb'
       EnqueuedWorker.jobs.clear
+      DirectWorker.jobs.clear
     end
 
     after do
@@ -112,6 +113,36 @@ class TestTesting < Minitest::Test
 
     end
 
+    class SpecificJidWorker
+      include Sidekiq::Worker
+      class_attribute :count
+      self.count = 0
+      def perform(worker_jid)
+        return unless worker_jid == self.jid
+        self.class.count += 1
+      end
+    end
+
+    it 'execute only jobs with assigned JID' do
+      4.times do |i|
+        jid = SpecificJidWorker.perform_async(nil)
+        if i % 2 == 0
+          SpecificJidWorker.jobs[-1]["args"] = ["wrong_jid"]
+        else
+          SpecificJidWorker.jobs[-1]["args"] = [jid]
+        end
+      end
+
+      SpecificJidWorker.perform_one
+      assert_equal 0, SpecificJidWorker.count
+
+      SpecificJidWorker.perform_one
+      assert_equal 1, SpecificJidWorker.count
+
+      SpecificJidWorker.drain
+      assert_equal 2, SpecificJidWorker.count
+    end
+
     it 'round trip serializes the job arguments' do
       assert StoredWorker.perform_async(:mike)
       job = StoredWorker.jobs.first

data/test/test_util.rb

@@ -0,0 +1,18 @@
+require 'helper'
+require 'sidekiq/util'
+
+class TestUtil < Minitest::Test
+  describe 'util' do
+    it 'generates the same process id when included in two or more classes' do
+      class One
+        include Sidekiq::Util
+      end
+
+      class Two
+        include Sidekiq::Util
+      end
+
+      assert_equal One.new.process_id, Two.new.process_id
+    end
+  end
+end

data/test/test_web.rb

@@ -76,6 +76,26 @@ class TestWeb < Minitest::Test
       end
     end
 
+    it 'can clear an empty worker list' do
+      post '/reset'
+      assert_equal 302, last_response.status
+    end
+
+    it 'can clear a non-empty worker list' do
+      Sidekiq.redis do |conn|
+        identity = 'foo'
+        conn.sadd('workers', identity)
+      end
+
+      post '/reset'
+
+      assert_equal 302, last_response.status
+
+      Sidekiq.redis do |conn|
+        refute conn.smembers('workers').any?
+      end
+    end
+
     it 'can delete a job' do
       Sidekiq.redis do |conn|
         conn.rpush('queue:foo', "{}")
@@ -178,6 +198,21 @@ class TestWeb < Minitest::Test
       end
     end
 
+    it "can move scheduled to default queue" do
+      params = add_scheduled
+      Sidekiq.redis do |conn|
+        assert_equal 1, conn.zcard('schedule')
+        assert_equal 0, conn.zcard('default')
+        post '/scheduled', 'key' => [job_params(*params)], 'add_to_queue' => 'AddToQueue'
+        assert_equal 302, last_response.status
+        assert_equal 'http://example.org/scheduled', last_response.header['Location']
+        assert_equal 0, conn.zcard('schedule')
+        get '/queues/default'
+        assert_equal 200, last_response.status
+        assert_match /#{params[0]['args'][2]}/, last_response.body
+      end
+    end
+
     it 'can retry all retries' do
       msg, score = add_retry
       add_retry

data/web/locales/da.yml

@@ -24,6 +24,7 @@ da:
   ShowAll: Vis alle
   CurrentMessagesInQueue: Nuværende beskeder i <span class='title'>%{queue}</span>
   Delete: Slet
+  AddToQueue: Tilføj til kø
   AreYouSureDeleteJob: Er du sikker på at du vil slette dette job?
   AreYouSureDeleteQueue: Er du sikker på at du vil slette %{queue} køen?
   Queues: Køer

data/web/locales/de.yml

@@ -24,6 +24,7 @@ de:
   ShowAll: Alle anzeigen
   CurrentMessagesInQueue: Aktuelle Nachrichten in <span class='title'>%{queue}</span>
   Delete: Löschen
+  AddToQueue: Add to queue
   AreYouSureDeleteJob: Möchtest du diesen Job wirklich löschen?
   AreYouSureDeleteQueue: Möchtest du %{queue} wirklich löschen?
   Queues: Warteschlangen

data/web/locales/en.yml

@@ -26,6 +26,7 @@ en: # <---- change this to your locale code
   ShowAll: Show All
   CurrentMessagesInQueue: Current messages in <span class='title'>%{queue}</span>
   Delete: Delete
+  AddToQueue: Add to queue
   AreYouSureDeleteJob: Are you sure you want to delete this job?
   AreYouSureDeleteQueue: Are you sure you want to delete the %{queue} queue?
   Queues: Queues

data/web/locales/es.yml

@@ -24,6 +24,7 @@ es:
   ShowAll: Mostrar Todo
   CurrentMessagesInQueue: Mensajes actualmente en <span class='title'>%{queue}</span>
   Delete: Eliminar
+  AddToQueue: Añadir a fila
   AreYouSureDeleteJob: ¿Estás seguro de eliminar este trabajo?
   AreYouSureDeleteQueue: ¿Estás seguro de eliminar la fila  %{queue}?
   Queues: Filas

data/web/locales/fr.yml

@@ -24,6 +24,7 @@ fr:
   ShowAll: Montrer Tout
   CurrentMessagesInQueue: Messages actuellement dans <span class='title'>%{queue}</span>
   Delete: Supprimer
+  AddToQueue: Ajouter à la liste
   AreYouSureDeleteJob: Êtes-vous certain de vouloir supprimer cette tâche?
   AreYouSureDeleteQueue: Êtes-vous certain de vouloir supprimer la file %{queue}?
   Queues: Queues

data/web/locales/it.yml

@@ -24,6 +24,7 @@ it:
   ShowAll: Mostra tutti
   CurrentMessagesInQueue: Messaggi in <span class='title'>%{queue}</span>
   Delete: Cancella
+  AddToQueue: Aggiungi a coda
   AreYouSureDeleteJob: Sei sicuro di voler cancellare questo lavoro?
   AreYouSureDeleteQueue: Sei sicuro di voler cancellare la coda %{queue}?
   Queues: Code

data/web/locales/ja.yml

@@ -25,6 +25,7 @@ ja:
   ShowAll: 全て見せる
   CurrentMessagesInQueue: <span class='title'>%{queue}</span>に メッセージがあります
   Delete: 削除
+  AddToQueue: キューに追加
   AreYouSureDeleteJob: このジョブを削除しますか？
   AreYouSureDeleteQueue: この %{queue} キューを削除しますか?
   Queues: キュー

data/web/locales/ko.yml

@@ -25,6 +25,7 @@ ko:
   ShowAll: 모두 보기
   CurrentMessagesInQueue: <span class='title'>%{queue}</span>에 대기 중인 메시지
   Delete: 삭제
+  AddToQueue: 큐 추가
   AreYouSureDeleteJob: 이 작업을 삭제하시겠습니까?
   AreYouSureDeleteQueue: 이 %{queue} 큐를 삭제하시겠습니까?
   Queues: 큐

data/web/locales/nl.yml

@@ -25,6 +25,7 @@ nl:
   ShowAll: Toon alle
   CurrentMessagesInQueue: Aantal berichten in <span class='title'>%{queue}</span>
   Delete: Verwijderen
+  AddToQueue: Toevoegen aan wachtrij
   AreYouSureDeleteJob: Weet u zeker dat u deze taak wilt verwijderen?
   AreYouSureDeleteQueue: Weet u zeker dat u wachtrij %{queue} wilt verwijderen?
   Queues: Wachtrijen

data/web/locales/no.yml

@@ -25,6 +25,7 @@ no:
   ShowAll: Vis alle
   CurrentMessagesInQueue: Nåværende melding i <span class='title'>%{queue}</span>
   Delete: Slett
+  AddToQueue: Legg til i kø
   AreYouSureDeleteJob: Er du sikker på at du vil slette denne jobben?
   AreYouSureDeleteQueue: Er du sikker på at du vil slette køen %{queue}?
   Queues: Køer

data/web/locales/pl.yml

@@ -24,6 +24,7 @@ pl:
   ShowAll: Pokaż wszystko
   CurrentMessagesInQueue: Aktualne wiadomości w kolejce <span class='title'>%{queue}</span>
   Delete: Usuń
+  AddToQueue: dodaj do kolejki
   AreYouSureDeleteJob: Czy na pewno usunąć to zadanie?
   AreYouSureDeleteQueue: Czy na pewno usunąć kolejkę %{queue}?
   Queues: Kolejki

data/web/locales/pt-br.yml

@@ -25,6 +25,7 @@
   ShowAll: Mostrar todos
   CurrentMessagesInQueue: Mensagens atualmenta na <span class='title'>%{queue}</span>
   Delete: Apagar
+  AddToQueue: Adicionar à fila
   AreYouSureDeleteJob: Deseja deletar esta tarefa?
   AreYouSureDeleteQueue: Deseja deletar a %{queue} fila?
   Queues: Filas

data/web/locales/pt.yml

@@ -24,6 +24,7 @@ pt:
   ShowAll: Mostrar todos
   CurrentMessagesInQueue: Mensagens na fila <span class='title'>%{queue}</span>
   Delete: Apagar
+  AddToQueue: Adicionar à fila
   AreYouSureDeleteJob: Tem a certeza que deseja eliminar esta tarefa?
   AreYouSureDeleteQueue: Tem a certeza que deseja eliminar a fila %{queue}?
   Queues: Filas

data/web/locales/ru.yml

@@ -24,6 +24,7 @@ ru:
   ShowAll: Показать все
   CurrentMessagesInQueue: Текущие сообщения в <span class='title'>%{queue}</span>
   Delete: Удалить
+  AddToQueue: Добавить в очередь
   AreYouSureDeleteJob: Вы уверены в том, что хотите удалить задание?
   AreYouSureDeleteQueue: Вы уверены в том, что хотите удалить очередь %{queue}?
   Queues: Очереди

data/web/views/scheduled.slim

@@ -26,5 +26,6 @@ header.row
           td= msg['class']
           td= display_args(msg['args'])
     input.btn.btn-danger.pull-right type="submit" name="delete" value="#{t('Delete')}"
+    input.btn.btn-danger.pull-right type="submit" name="add_to_queue" value="#{t('AddToQueue')}"
 - else
   .alert.alert-success = t('NoScheduledFound')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 2.12.4
+  version: 2.13.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-13 00:00:00.000000000 Z
+date: 2013-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -203,7 +203,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Simple, efficient message processing for Ruby
+description: Simple, efficient background processing for Ruby
 email:
 - mperham@gmail.com
 executables:
@@ -278,6 +278,7 @@ files:
 - test/test_sidekiq.rb
 - test/test_testing.rb
 - test/test_testing_inline.rb
+- test/test_util.rb
 - test/test_web.rb
 - web/assets/images/bootstrap/glyphicons-halflings-white.png
 - web/assets/images/bootstrap/glyphicons-halflings.png
@@ -340,7 +341,7 @@ rubyforge_project:
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Simple, efficient message processing for Ruby
+summary: Simple, efficient background processing for Ruby
 test_files:
 - test/config.yml
 - test/env_based_config.yml
@@ -362,4 +363,5 @@ test_files:
 - test/test_sidekiq.rb
 - test/test_testing.rb
 - test/test_testing_inline.rb
+- test/test_util.rb
 - test/test_web.rb