sidekiq 2.11.2 → 2.12.0

data/Changes.md

@@ -1,3 +1,18 @@
+2.12.0
+-----------
+
+- Upgrade to Celluloid 0.14, remove the use of Celluloid's thread
+  pool.  This should halve the number of threads in each Sidekiq
+  process, thus requiring less resources. [#919]
+- Abstract Celluloid usage to Sidekiq::Actor for testing purposes.
+- Better handling for Redis downtime when fetching jobs and shutting
+  down, don't print exceptions every second and print success message
+  when Redis is back.
+- Fix unclean shutdown leading to duplicate jobs [#897]
+- Add Korean locale [#890]
+- Upgrade test suite to Minitest 5
+- Remove usage of `multi_json` as `json` is now robust on all platforms.
+
 2.11.2
 -----------
 

data/Gemfile

@@ -1,7 +1,6 @@
 source 'http://rubygems.org'
 gemspec
 
-gem 'celluloid', "~> 0.13.0"
 gem 'slim'
 gem 'sqlite3', :platform => :mri
 

data/Pro-Changes.md

@@ -0,0 +1,127 @@
+Sidekiq Pro Changelog
+=======================
+
+Please see http://sidekiq.org/pro for more details and how to buy.
+
+HEAD
+-----------
+
+- New `sidekiq/pro/reliable_push` which makes Sidekiq::Client resiliant
+  to Redis network failures. [#793]
+- Move `sidekiq/reliable_fetch` to `sidekiq/pro/reliable_fetch`
+
+
+1.0.0
+-----------
+
+- Sidekiq Pro changelog moved to mperham/sidekiq for public visibility.
+- Add new Rack endpoint for easy polling of batch status via JavaScript.  See `sidekiq/rack/batch_status`
+
+0.9.3
+-----------
+
+- Fix bad /batches path in Web UI
+- Fix Sinatra conflict with sidekiq-failures
+
+0.9.2
+-----------
+
+- Fix issue with lifecycle notifications not firing.
+
+0.9.1
+-----------
+
+- Update due to Sidekiq API changes.
+
+0.9.0
+-----------
+
+- Rearchitect Sidekiq's Fetch code to support different fetch
+strategies.  Add a ReliableFetch strategy which works with Redis'
+RPOPLPUSH to ensure we don't lose messages, even when the Sidekiq
+process crashes unexpectedly. [mperham/sidekiq#607]
+
+0.8.2
+-----------
+
+- Reimplement existing notifications using batch on_complete events.
+
+0.8.1
+-----------
+
+- Rejigger batch callback notifications.
+
+
+0.8.0
+-----------
+
+- Add new Batch 'callback' notification support, for in-process
+  notification.
+- Symbolize option keys passed to Pony [mperham/sidekiq#603]
+- Batch no longer requires the Web UI since Web UI usage is optional.
+  You must require is manually in your Web process:
+
+```ruby
+require 'sidekiq/web'
+require 'sidekiq/batch/web'
+mount Sidekiq::Web => '/sidekiq'
+```
+
+
+0.7.1
+-----------
+
+- Worker instances can access the associated jid and bid via simple
+  accessors.
+- Batches can now be modified while being processed so, e.g. a batch
+  job can add additional jobs to its own batch.
+
+```ruby
+def perform(...)
+  batch = Sidekiq::Batch.new(bid) # instantiate batch associated with this job
+  batch.jobs do
+    SomeWorker.perform_async # add another job
+  end
+end
+```
+
+- Save error backtraces in batch's failure info for display in Web UI.
+- Clean up email notification a bit.
+
+
+0.7.0
+-----------
+
+- Add optional batch description
+- Mutable batches.  Batches can now be modified to add additional jobs
+  at runtime.  Example would be a batch job which needs to create more
+  jobs based on the data it is processing.
+
+```ruby
+batch = Sidekiq::Batch.new(bid)
+batch.jobs do
+  # define more jobs here
+end
+```
+- Fix issues with symbols vs strings in option hashes
+
+
+0.6.1
+-----------
+
+- Webhook notification support
+
+
+0.6
+-----------
+
+- Redis pubsub
+- Email polish
+
+
+0.5
+-----------
+
+- Batches
+- Notifications
+- Statsd middleware

data/lib/sidekiq.rb

@@ -7,7 +7,7 @@ require 'sidekiq/redis_connection'
 require 'sidekiq/util'
 require 'sidekiq/api'
 
-require 'multi_json'
+require 'json'
 
 module Sidekiq
   NAME = "Sidekiq"
@@ -90,11 +90,11 @@ module Sidekiq
   end
 
   def self.load_json(string)
-    MultiJson.decode(string, :symbolize_keys => false)
+    JSON.parse(string)
   end
 
   def self.dump_json(object)
-    MultiJson.encode(object)
+    JSON.generate(object)
   end
 
   def self.logger
@@ -115,4 +115,3 @@ require 'sidekiq/extensions/class_methods'
 require 'sidekiq/extensions/action_mailer'
 require 'sidekiq/extensions/active_record'
 require 'sidekiq/rails' if defined?(::Rails::Engine)
-

data/lib/sidekiq/actor.rb

@@ -0,0 +1,67 @@
+module Sidekiq
+  #
+  # Celluloid has the nasty side effect of making objects
+  # very hard to test because they are immediately async
+  # upon creation.  In testing we want to just treat
+  # the actors as POROs.
+  #
+  # Instead of including Celluloid, we'll just stub
+  # out the key methods we use so that everything works
+  # synchronously.  The alternative is no test coverage.
+  #
+  module Actor
+    if $TESTING
+
+      TaskThread = 0
+
+      def sleep(amount=0)
+      end
+
+      def after(amount=0)
+      end
+
+      def defer
+        yield
+      end
+
+      def current_actor
+        self
+      end
+
+      def alive?
+        !@dead
+      end
+
+      def terminate
+        @dead = true
+      end
+
+      def async
+        self
+      end
+
+      def signal(sym)
+      end
+
+      # we don't want to hide or catch failures in testing
+      def watchdog(msg)
+        yield
+      end
+
+      def self.included(klass)
+        class << klass
+          alias_method :new_link, :new
+          def trap_exit(meth)
+          end
+          def task_class(konstant)
+          end
+        end
+      end
+
+    else
+      def self.included(klass)
+        klass.send(:include, Celluloid)
+      end
+    end
+  end
+end

data/lib/sidekiq/exception_handler.rb

@@ -33,7 +33,7 @@ module Sidekiq
     end
 
     def send_to_exception_notifier(msg, ex)
-      ::ExceptionNotifier::Notifier.background_exception_notification(ex, :data => { :message => msg }).deliver
+      ::ExceptionNotifier.notify_exception(ex, :data => {:message => msg})
     end
   end
 end

data/lib/sidekiq/extensions/generic_proxy.rb

@@ -1,3 +1,5 @@
+require 'yaml'
+
 module Sidekiq
   module Extensions
     class Proxy < BasicObject

data/lib/sidekiq/fetch.rb

@@ -1,5 +1,5 @@
 require 'sidekiq'
-require 'celluloid'
+require 'sidekiq/actor'
 
 module Sidekiq
   ##
@@ -7,12 +7,13 @@ module Sidekiq
   # from the queues.  It gets the message and hands it to the Manager
   # to assign to a ready Processor.
   class Fetcher
-    include Celluloid
-    include Sidekiq::Util
+    include Util
+    include Actor
 
     TIMEOUT = 1
 
     def initialize(mgr, options)
+      @down = nil
       @mgr = mgr
       @strategy = Fetcher.strategy.new(options)
     end
@@ -31,6 +32,8 @@ module Sidekiq
 
         begin
           work = @strategy.retrieve_work
+          ::Sidekiq.logger.info("Redis is online, #{Time.now.to_f - @down.to_f} sec downtime") if @down
+          @down = nil
 
           if work
             @mgr.async.assign(work)
@@ -38,12 +41,25 @@ module Sidekiq
             after(0) { fetch }
           end
         rescue => ex
-          logger.error("Error fetching message: #{ex}")
-          logger.error(ex.backtrace.first)
-          sleep(TIMEOUT)
-          after(0) { fetch }
+          handle_exception(ex)
+        end
+
+      end
+    end
+
+    def handle_exception(ex)
+      if !@down
+        logger.error("Error fetching message: #{ex}")
+        ex.backtrace.each do |bt|
+          logger.error(bt)
         end
       end
+      @down ||= Time.now
+      sleep(TIMEOUT)
+      after(0) { fetch }
+    rescue Task::TerminatedError
+      # If redis is down when we try to shut down, all the fetch backlog
+      # raises these errors.  Haven't been able to figure out what I'm doing wrong.
     end
 
     # Ugh.  Say hello to a bloody hack.
@@ -88,6 +104,8 @@ module Sidekiq
         end
       end
       Sidekiq.logger.info("Pushed #{inprogress.size} messages back to Redis")
+    rescue => ex
+      Sidekiq.logger.warn("Failed to requeue #{inprogress.size} jobs: #{ex.message}")
     end
 
     UnitOfWork = Struct.new(:queue, :message) do

data/lib/sidekiq/manager.rb

@@ -1,6 +1,5 @@
-require 'celluloid'
-
 require 'sidekiq/util'
+require 'sidekiq/actor'
 require 'sidekiq/processor'
 require 'sidekiq/fetch'
 
@@ -13,10 +12,13 @@ module Sidekiq
   #
   class Manager
     include Util
-    include Celluloid
-
+    include Actor
     trap_exit :processor_died
 
+    attr_reader :ready
+    attr_reader :busy
+    attr_accessor :fetcher
+
     def initialize(options={})
       logger.debug { options.inspect }
       @count = options[:concurrency] || 25
@@ -122,6 +124,8 @@ module Sidekiq
         end
         conn.srem('workers', workers_to_remove) if !workers_to_remove.empty?
       end
+    rescue => ex
+      Sidekiq.logger.warn("Unable to clear worker set while shutting down: #{ex.message}")
     end
 
     def hard_shutdown_in(delay)

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

@@ -48,6 +48,9 @@ module Sidekiq
 
         def call(worker, msg, queue)
           yield
+        rescue Sidekiq::Shutdown
+          # ignore, will be pushed back onto queue
+          raise
         rescue Exception => e
           raise e unless msg['retry']
           max_retry_attempts = retry_attempts_from(msg['retry'], DEFAULT_MAX_RETRY_ATTEMPTS)

data/lib/sidekiq/processor.rb

@@ -1,5 +1,5 @@
-require 'celluloid'
 require 'sidekiq/util'
+require 'sidekiq/actor'
 
 require 'sidekiq/middleware/server/active_record'
 require 'sidekiq/middleware/server/retry_jobs'
@@ -12,7 +12,9 @@ module Sidekiq
   # chain and then calls Sidekiq::Worker#perform.
   class Processor
     include Util
-    include Celluloid
+    include Actor
+
+    task_class TaskThread
 
     def self.default_middleware
       Middleware::Chain.new do |m|
@@ -34,29 +36,29 @@ module Sidekiq
     def process(work)
       msgstr = work.message
       queue = work.queue_name
-      defer do
-        @actual_work_thread = Thread.current
-        begin
-          msg = Sidekiq.load_json(msgstr)
-          klass  = msg['class'].constantize
-          worker = klass.new
-          worker.jid = msg['jid']
-
-          stats(worker, msg, queue) do
-            Sidekiq.server_middleware.invoke(worker, msg, queue) do
-              worker.perform(*cloned(msg['args']))
-            end
+
+      @actual_work_thread = Thread.current
+      begin
+        msg = Sidekiq.load_json(msgstr)
+        klass  = msg['class'].constantize
+        worker = klass.new
+        worker.jid = msg['jid']
+
+        stats(worker, msg, queue) do
+          Sidekiq.server_middleware.invoke(worker, msg, queue) do
+            worker.perform(*cloned(msg['args']))
           end
-        rescue Sidekiq::Shutdown
-          # Had to force kill this job because it didn't finish
-          # within the timeout.
-        rescue Exception => ex
-          handle_exception(ex, msg || { :message => msgstr })
-          raise
-        ensure
-          work.acknowledge
         end
+      rescue Sidekiq::Shutdown
+        # Had to force kill this job because it didn't finish
+        # within the timeout.
+      rescue Exception => ex
+        handle_exception(ex, msg || { :message => msgstr })
+        raise
+      ensure
+        work.acknowledge
       end
+
       @boss.async.processor_done(current_actor)
     end
 

data/lib/sidekiq/scheduled.rb

@@ -1,6 +1,6 @@
 require 'sidekiq'
 require 'sidekiq/util'
-require 'celluloid'
+require 'sidekiq/actor'
 
 module Sidekiq
   module Scheduled
@@ -13,8 +13,8 @@ module Sidekiq
     # just pops the message back onto its original queue so the
     # workers can pick it up like any other message.
     class Poller
-      include Celluloid
-      include Sidekiq::Util
+      include Util
+      include Actor
 
       SETS = %w(retry schedule)
 
@@ -42,7 +42,7 @@ module Sidekiq
                       conn.sadd('queues', msg['queue'])
                       conn.lpush("queue:#{msg['queue']}", message)
                     end
-                    logger.debug("enqueued #{sorted_set}: #{message}") if logger.debug?
+                    logger.debug { "enqueued #{sorted_set}: #{message}" }
                   end
                 end
               end
@@ -51,7 +51,7 @@ module Sidekiq
             # Most likely a problem with redis networking.
             # Punt and try again at the next interval
             logger.error ex.message
-            logger.error(ex.backtrace.first)
+            logger.error ex.backtrace.first
           end
 
           after(poll_interval) { poll }

data/lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "2.11.2"
+  VERSION = "2.12.0"
 end

data/sidekiq.gemspec

@@ -17,11 +17,11 @@ Gem::Specification.new do |gem|
   gem.add_dependency                  'redis', '>= 3.0'
   gem.add_dependency                  'redis-namespace'
   gem.add_dependency                  'connection_pool', '>= 1.0.0'
-  gem.add_dependency                  'celluloid', '>= 0.13.0'
-  gem.add_dependency                  'multi_json'
+  gem.add_dependency                  'celluloid', '>= 0.14.0'
+  gem.add_dependency                  'json'
   gem.add_development_dependency      'sinatra'
   gem.add_development_dependency      'slim'
-  gem.add_development_dependency      'minitest'
+  gem.add_development_dependency      'minitest', '~> 5'
   gem.add_development_dependency      'rake'
   gem.add_development_dependency      'actionmailer'
   gem.add_development_dependency      'activerecord'

data/test/helper.rb

@@ -1,3 +1,4 @@
+$TESTING = true
 require 'coveralls'
 Coveralls.wear! do
   add_filter "/test/"
@@ -16,13 +17,17 @@ begin
 rescue LoadError
 end
 
-require 'minitest/unit'
 require 'minitest/autorun'
-require 'minitest/emoji'
+require 'minitest/pride'
 
 require 'sidekiq'
 require 'sidekiq/util'
 Sidekiq.logger.level = Logger::ERROR
 
 require 'sidekiq/redis_connection'
-REDIS = Sidekiq::RedisConnection.create(:url => "redis://localhost/15", :namespace => 'testy')
+redis_url = ENV['REDIS_URL'] || 'redis://localhost/15'
+REDIS = Sidekiq::RedisConnection.create(:url => redis_url, :namespace => 'testy')
+
+Sidekiq.configure_client do |config|
+  config.redis = { :url => redis_url, :namespace => 'testy' }
+end

data/test/test_api.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestApi < MiniTest::Unit::TestCase
+class TestApi < Minitest::Test
   describe "stats" do
     before do
       Sidekiq.redis {|c| c.flushdb }

data/test/test_cli.rb

@@ -11,7 +11,7 @@ def cli.valid?
   !@code
 end
 
-class TestCli < MiniTest::Unit::TestCase
+class TestCli < Minitest::Test
   describe 'with cli' do
 
     before do

data/test/test_client.rb

@@ -2,10 +2,10 @@ require 'helper'
 require 'sidekiq/client'
 require 'sidekiq/worker'
 
-class TestClient < MiniTest::Unit::TestCase
+class TestClient < Minitest::Test
   describe 'with mock redis' do
     before do
-      @redis = MiniTest::Mock.new
+      @redis = Minitest::Mock.new
       def @redis.multi; [yield] * 2 if block_given?; end
       def @redis.set(*); true; end
       def @redis.sadd(*); true; end
@@ -22,6 +22,10 @@ class TestClient < MiniTest::Unit::TestCase
       Sidekiq.instance_variable_set(:@redis, @redis)
     end
 
+    after do
+      Sidekiq.instance_variable_set(:@redis, REDIS)
+    end
+
     it 'raises ArgumentError with invalid params' do
       assert_raises ArgumentError do
         Sidekiq::Client.push('foo', 1)

data/test/test_exception_handler.rb

@@ -17,7 +17,7 @@ class Component
   end
 end
 
-class TestExceptionHandler < MiniTest::Unit::TestCase
+class TestExceptionHandler < Minitest::Test
   describe "with mock logger" do
     before do
       @old_logger = Sidekiq.logger
@@ -41,7 +41,7 @@ class TestExceptionHandler < MiniTest::Unit::TestCase
 
   describe "with fake Airbrake" do
     before do
-      ::Airbrake = MiniTest::Mock.new
+      ::Airbrake = Minitest::Mock.new
     end
 
     after do
@@ -57,7 +57,7 @@ class TestExceptionHandler < MiniTest::Unit::TestCase
 
   describe "with fake Honeybadger" do
     before do
-      ::Honeybadger = MiniTest::Mock.new
+      ::Honeybadger = Minitest::Mock.new
     end
 
     after do
@@ -73,8 +73,7 @@ class TestExceptionHandler < MiniTest::Unit::TestCase
 
   describe "with fake ExceptionNotifier" do
     before do
-      ::ExceptionNotifier = Module.new
-      ::ExceptionNotifier::Notifier = MiniTest::Mock.new
+      ::ExceptionNotifier = Minitest::Mock.new
     end
 
     after do
@@ -82,12 +81,9 @@ class TestExceptionHandler < MiniTest::Unit::TestCase
     end
 
     it "notifies ExceptionNotifier" do
-      mail = MiniTest::Mock.new
-      mail.expect(:deliver,nil)
-      ::ExceptionNotifier::Notifier.expect(:background_exception_notification,mail,[TEST_EXCEPTION, :data => { :message => { :b => 2 } }])
+      ::ExceptionNotifier.expect(:notify_exception,nil,[TEST_EXCEPTION, :data => { :message => { :b => 2 } }])
       Component.new.invoke_exception(:b => 2)
-      ::ExceptionNotifier::Notifier.verify
-      mail.verify
+      ::ExceptionNotifier.verify
     end
   end
 
@@ -104,9 +100,9 @@ class TestExceptionHandler < MiniTest::Unit::TestCase
         end
       end
 
-      ::Exceptional::Config = MiniTest::Mock.new
-      ::Exceptional::Remote = MiniTest::Mock.new
-      ::Exceptional::ExceptionData = MiniTest::Mock.new
+      ::Exceptional::Config = Minitest::Mock.new
+      ::Exceptional::Remote = Minitest::Mock.new
+      ::Exceptional::ExceptionData = Minitest::Mock.new
     end
 
     after do

data/test/test_extensions.rb

@@ -8,7 +8,7 @@ require 'sidekiq/rails'
 
 Sidekiq.hook_rails!
 
-class TestExtensions < MiniTest::Unit::TestCase
+class TestExtensions < Minitest::Test
   describe 'sidekiq extensions' do
     before do
       Sidekiq.redis = REDIS

data/test/test_fetch.rb

@@ -1,7 +1,7 @@
 require 'helper'
 require 'sidekiq/fetch'
 
-class TestFetcher < MiniTest::Unit::TestCase
+class TestFetcher < Minitest::Test
   describe 'fetcher' do
     before do
       Sidekiq.redis = { :namespace => 'fuzzy' }

data/test/test_manager.rb

@@ -0,0 +1,90 @@
+require 'helper'
+require 'sidekiq/manager'
+
+class TestManager < Minitest::Test
+
+  describe 'manager' do
+    it 'creates N processor instances' do
+      mgr = Sidekiq::Manager.new(options)
+      assert_equal options[:concurrency], mgr.ready.size
+      assert_equal [], mgr.busy
+      assert mgr.fetcher
+    end
+
+    it 'fetches upon start' do
+      mgr = Sidekiq::Manager.new(options)
+      count = options[:concurrency]
+
+      fetch_mock = Minitest::Mock.new
+      count.times { fetch_mock.expect(:fetch, nil, []) }
+      async_mock = Minitest::Mock.new
+      count.times { async_mock.expect(:async, fetch_mock, []) }
+      mgr.fetcher = async_mock
+      mgr.start
+
+      fetch_mock.verify
+      async_mock.verify
+    end
+
+    it 'assigns work to a processor' do
+      uow = Minitest::Mock.new
+      processor = Minitest::Mock.new
+      processor.expect(:async, processor, [])
+      processor.expect(:process, nil, [uow])
+
+      mgr = Sidekiq::Manager.new(options)
+      mgr.ready << processor
+      mgr.assign(uow)
+      assert_equal 1, mgr.busy.size
+
+      processor.verify
+    end
+
+    it 'requeues work if stopping' do
+      uow = Minitest::Mock.new
+      uow.expect(:requeue, nil, [])
+
+      mgr = Sidekiq::Manager.new(options)
+      mgr.stop
+      mgr.assign(uow)
+      uow.verify
+    end
+
+    it 'shuts down the system' do
+      mgr = Sidekiq::Manager.new(options)
+      mgr.stop
+
+      assert mgr.busy.empty?
+      assert mgr.ready.empty?
+      refute mgr.fetcher.alive?
+    end
+
+    it 'returns finished processors to the ready pool' do
+      mgr = Sidekiq::Manager.new(options)
+      init_size = mgr.ready.size
+      processor = mgr.ready.pop
+      mgr.busy << processor
+      mgr.processor_done(processor)
+
+      assert_equal 0, mgr.busy.size
+      assert_equal init_size, mgr.ready.size
+    end
+
+    it 'throws away dead processors' do
+      mgr = Sidekiq::Manager.new(options)
+      init_size = mgr.ready.size
+      processor = mgr.ready.pop
+      mgr.busy << processor
+      mgr.processor_died(processor, 'ignored')
+
+      assert_equal 0, mgr.busy.size
+      assert_equal init_size, mgr.ready.size
+      refute mgr.ready.include?(processor)
+    end
+
+    def options
+      { :concurrency => 3, :queues => ['default'] }
+    end
+  end
+
+end

data/test/test_middleware.rb

@@ -2,7 +2,7 @@ require 'helper'
 require 'sidekiq/middleware/chain'
 require 'sidekiq/processor'
 
-class TestMiddleware < MiniTest::Unit::TestCase
+class TestMiddleware < Minitest::Test
   describe 'middleware chain' do
     before do
       $errors = []
@@ -78,9 +78,9 @@ class TestMiddleware < MiniTest::Unit::TestCase
         chain.insert_after AnotherCustomMiddleware, YetAnotherCustomMiddleware, '3', $recorder
       end
 
-      boss = MiniTest::Mock.new
+      boss = Minitest::Mock.new
       processor = Sidekiq::Processor.new(boss)
-      actor = MiniTest::Mock.new
+      actor = Minitest::Mock.new
       actor.expect(:processor_done, nil, [processor])
       boss.expect(:async, actor, [])
       processor.process(Sidekiq::BasicFetch::UnitOfWork.new('queue:default', msg))

data/test/test_processor.rb

@@ -1,14 +1,14 @@
 require 'helper'
 require 'sidekiq/processor'
 
-class TestProcessor < MiniTest::Unit::TestCase
+class TestProcessor < Minitest::Test
   TestException = Class.new(StandardError)
   TEST_EXCEPTION = TestException.new("kerboom!")
 
   describe 'with mock setup' do
     before do
       $invokes = 0
-      @boss = MiniTest::Mock.new
+      @boss = Minitest::Mock.new
       @processor = ::Sidekiq::Processor.new(@boss)
       Celluloid.logger = nil
       Sidekiq.redis = REDIS
@@ -29,7 +29,7 @@ class TestProcessor < MiniTest::Unit::TestCase
 
     it 'processes as expected' do
       msg = Sidekiq.dump_json({ 'class' => MockWorker.to_s, 'args' => ['myarg'] })
-      actor = MiniTest::Mock.new
+      actor = Minitest::Mock.new
       actor.expect(:processor_done, nil, [@processor])
       @boss.expect(:async, actor, [])
       @processor.process(work(msg))
@@ -65,7 +65,7 @@ class TestProcessor < MiniTest::Unit::TestCase
       msg = { 'class' => MockWorker.to_s, 'args' => [['myarg']] }
       msgstr = Sidekiq.dump_json(msg)
       processor = ::Sidekiq::Processor.new(@boss)
-      actor = MiniTest::Mock.new
+      actor = Minitest::Mock.new
       actor.expect(:processor_done, nil, [processor])
       @boss.expect(:async, actor, [])
       processor.process(work(msgstr))
@@ -80,7 +80,7 @@ class TestProcessor < MiniTest::Unit::TestCase
       describe 'when successful' do
         def successful_job
           msg = Sidekiq.dump_json({ 'class' => MockWorker.to_s, 'args' => ['myarg'] })
-          actor = MiniTest::Mock.new
+          actor = Minitest::Mock.new
           actor.expect(:processor_done, nil, [@processor])
           @boss.expect(:async, actor, [])
           @processor.process(work(msg))

data/test/test_redis_connection.rb

@@ -1,7 +1,7 @@
 require 'helper'
 require 'sidekiq/redis_connection'
 
-class TestRedisConnection < MiniTest::Unit::TestCase
+class TestRedisConnection < Minitest::Test
 
   describe ".create" do
 

data/test/test_retry.rb

@@ -2,10 +2,10 @@ require 'helper'
 require 'sidekiq/scheduled'
 require 'sidekiq/middleware/server/retry_jobs'
 
-class TestRetry < MiniTest::Unit::TestCase
+class TestRetry < Minitest::Test
   describe 'middleware' do
     before do
-      @redis = MiniTest::Mock.new
+      @redis = Minitest::Mock.new
       # Ugh, this is terrible.
       Sidekiq.instance_variable_set(:@redis, @redis)
 
@@ -150,7 +150,7 @@ class TestRetry < MiniTest::Unit::TestCase
           raise "kerblammo!"
         end
       end
-      # MiniTest can't assert that a method call did NOT happen!?
+      # Minitest can't assert that a method call did NOT happen!?
       assert_raises(MockExpectationError) { @redis.verify }
     end
 
@@ -164,12 +164,12 @@ class TestRetry < MiniTest::Unit::TestCase
           raise "kerblammo!"
         end
       end
-      # MiniTest can't assert that a method call did NOT happen!?
+      # Minitest can't assert that a method call did NOT happen!?
       assert_raises(MockExpectationError) { @redis.verify }
     end
 
     describe "retry exhaustion" do
-      let(:worker){ MiniTest::Mock.new }
+      let(:worker){ Minitest::Mock.new }
       let(:handler){ Sidekiq::Middleware::Server::RetryJobs.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} }
 

data/test/test_scheduled.rb

@@ -1,13 +1,13 @@
 require 'helper'
 require 'sidekiq/scheduled'
 
-class TestScheduled < MiniTest::Unit::TestCase
+class TestScheduled < Minitest::Test
   class ScheduledWorker
     include Sidekiq::Worker
     def perform(x)
     end
   end
-  
+
   describe 'poller' do
     before do
       Sidekiq.redis = REDIS
@@ -34,8 +34,7 @@ class TestScheduled < MiniTest::Unit::TestCase
 
         poller = Sidekiq::Scheduled::Poller.new
         poller.poll
-        poller.terminate
-        
+
         assert_equal [error_1], conn.lrange("queue:queue_1", 0, -1)
         assert_equal [error_2], conn.lrange("queue:queue_2", 0, -1)
         assert_equal [error_3], conn.zrange("retry", 0, -1)

data/test/test_scheduling.rb

@@ -1,10 +1,10 @@
 require 'helper'
 require 'sidekiq/scheduled'
 
-class TestScheduling < MiniTest::Unit::TestCase
+class TestScheduling < Minitest::Test
   describe 'middleware' do
     before do
-      @redis = MiniTest::Mock.new
+      @redis = Minitest::Mock.new
       # Ugh, this is terrible.
       Sidekiq.instance_variable_set(:@redis, @redis)
 

data/test/test_sidekiq.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'helper'
 
-class TestSidekiq < MiniTest::Unit::TestCase
+class TestSidekiq < Minitest::Test
   describe 'json processing' do
     it 'loads json' do
       assert_equal ({"foo" => "bar"}), Sidekiq.load_json("{\"foo\":\"bar\"}")
@@ -14,7 +14,7 @@ class TestSidekiq < MiniTest::Unit::TestCase
 
   describe "redis connection" do
   	it "returns error without creating a connection if block is not given" do
-      mock = MiniTest::Mock.new
+      mock = Minitest::Mock.new
       mock.expect :create, nil #Sidekiq::RedisConnection, create
   		assert_raises(ArgumentError) {
   			Sidekiq.redis

data/test/test_testing.rb

@@ -9,7 +9,7 @@ require 'sidekiq/extensions/active_record'
 
 Sidekiq.hook_rails!
 
-class TestTesting < MiniTest::Unit::TestCase
+class TestTesting < Minitest::Test
   describe 'sidekiq testing' do
     class PerformError < RuntimeError; end
 

data/test/test_testing_inline.rb

@@ -9,7 +9,7 @@ require 'sidekiq/extensions/active_record'
 
 Sidekiq.hook_rails!
 
-class TestInline < MiniTest::Unit::TestCase
+class TestInline < Minitest::Test
   describe 'sidekiq inline testing' do
     class InlineError < RuntimeError; end
     class ParameterIsNotString < RuntimeError; end

data/test/test_web.rb

@@ -3,7 +3,7 @@ require 'sidekiq'
 require 'sidekiq/web'
 require 'rack/test'
 
-class TestWeb < MiniTest::Unit::TestCase
+class TestWeb < Minitest::Test
   describe 'sidekiq web' do
     include Rack::Test::Methods
 

data/web/locales/ko.yml

@@ -0,0 +1,62 @@
+# elements like %{queue} are variables and should not be translated
+ko:
+  Dashboard: 대시보드
+  Status: 상태
+  Time: 시간
+  Namespace: 네임스페이스
+  Realtime: 실시간
+  History: 히스토리
+  Busy: 바쁨
+  Processed: 처리완료
+  Failed: 실패
+  Scheduled: 예약
+  Retries: 재시도
+  Enqueued: 대기 중
+  ClearWorkerList: 워커 목록 비우기
+  Worker: 워커
+  Workers: 워커
+  LivePoll: 폴링 시작
+  StopPolling: 폴링 중단
+  Queue: 큐
+  Class: 클래스
+  Job: 작업
+  Arguments: 인자
+  Started: 시작
+  ShowAll: 모두 보기
+  CurrentMessagesInQueue: <span class='title'>%{queue}</span>에 대기 중인 메시지
+  Delete: 삭제
+  AreYouSureDeleteJob: 이 작업을 삭제하시겠습니까?
+  AreYouSureDeleteQueue: 이 %{queue} 큐를 삭제하시겠습니까?
+  Queues: 큐
+  Size: 크기
+  Actions: 동작
+  NextRetry: 다음 재시도
+  RetryCount: 재시도 횟수
+  RetryNow: 지금 재시도
+  LastRetry: 최근 재시도
+  OriginallyFailed: 실패
+  AreYouSure: 정말입니까?
+  DeleteAll: 모두 삭제
+  RetryAll: 모두 재시도
+  NoRetriesFound: 재시도 내역이 없습니다
+  Error: 에러
+  ErrorClass: 에러 클래스
+  ErrorMessage: 에러 메시지
+  ErrorBacktrace: 에러 Backtrace
+  GoBack: ← 뒤로
+  NoScheduledFound: 예약된 작업이 없습니다
+  When: 언제
+  ScheduledJobs: 예약된 작업
+  idle: 대기 중
+  active: 동작 중
+  Version: 버전
+  Connections: 커넥션
+  MemoryUsage: 메모리 사용량
+  PeakMemoryUsage: 최대 메모리 사용량
+  Uptime: 업타임 (일)
+  OneWeek: 1 주
+  OneMonth: 1 달
+  ThreeMonths: 3 달
+  SixMonths: 6 달
+  Batches: 배치
+  Failures: 실패

data/web/views/_nav.slim

@@ -5,13 +5,12 @@
     ul.nav
       - tabs.each do |title, url|
         - if url == ''
-          li class="#{(current_path == url) ? 'active':''}"
-            a href='#{{root_path}}#{{url}}' = t(title)
+          li class="#{current_path == url ? 'active' : ''}"
+            a href="#{{root_path}}#{{url}}" = t(title)
         - else
-          li class="#{(current_path =~ Regexp.new(url)) ? 'active':''}"
-            a href='#{{root_path}}#{{url}}' = t(title)
+          li class="#{current_path.start_with?(url) ? 'active' : ''}"
+            a href="#{{root_path}}#{{url}}" = t(title)
 
       - custom_tabs.each do |title, url|
-          li class="#{(current_path =~ Regexp.new(url)) ? 'active':''}"
-            a href='#{{root_path}}#{{url}}' = t(title)
-
+          li class="#{current_path.start_with?(url) ? 'active' : ''}"
+            a href="#{{root_path}}#{{url}}" = t(title)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 2.11.2
+  version: 2.12.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-01 00:00:00.000000000 Z
+date: 2013-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,9 +74,9 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -128,17 +128,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -218,12 +218,14 @@ files:
 - Changes.md
 - Gemfile
 - LICENSE
+- Pro-Changes.md
 - README.md
 - Rakefile
 - bin/sidekiq
 - bin/sidekiqctl
 - config.ru
 - lib/sidekiq.rb
+- lib/sidekiq/actor.rb
 - lib/sidekiq/api.rb
 - lib/sidekiq/capistrano.rb
 - lib/sidekiq/cli.rb
@@ -266,6 +268,7 @@ files:
 - test/test_exception_handler.rb
 - test/test_extensions.rb
 - test/test_fetch.rb
+- test/test_manager.rb
 - test/test_middleware.rb
 - test/test_processor.rb
 - test/test_redis_connection.rb
@@ -293,6 +296,7 @@ files:
 - web/locales/fr.yml
 - web/locales/it.yml
 - web/locales/ja.yml
+- web/locales/ko.yml
 - web/locales/nl.yml
 - web/locales/no.yml
 - web/locales/pl.yml
@@ -348,6 +352,7 @@ test_files:
 - test/test_exception_handler.rb
 - test/test_extensions.rb
 - test/test_fetch.rb
+- test/test_manager.rb
 - test/test_middleware.rb
 - test/test_processor.rb
 - test/test_redis_connection.rb