sidekiq 2.10.1 → 2.11.0

data/Changes.md

@@ -1,3 +1,13 @@
+2.11.0
+-----------
+
+- Upgrade to Celluloid 0.13. [#834]
+- Remove **timeout** support from `sidekiq_options`.  Ruby's timeout
+  is inherently unsafe in a multi-threaded application and was causing
+  stability problems for many.  See http://bit.ly/OtYpK
+- Add Japanese locale for Web UI [#868]
+- Fix a few issues with Web UI i18n.
+
 2.10.1
 -----------
 

data/Gemfile

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

data/lib/sidekiq.rb

@@ -7,11 +7,6 @@ require 'sidekiq/redis_connection'
 require 'sidekiq/util'
 require 'sidekiq/api'
 
-require 'sidekiq/extensions/class_methods'
-require 'sidekiq/extensions/action_mailer'
-require 'sidekiq/extensions/active_record'
-require 'sidekiq/rails' if defined?(::Rails::Engine)
-
 require 'multi_json'
 
 module Sidekiq
@@ -43,7 +38,7 @@ module Sidekiq
   # Configuration for Sidekiq server, use like:
   #
   #   Sidekiq.configure_server do |config|
-  #     config.redis = { :namespace => 'myapp', :size => 25, :url => 'redis://myhost:8877/mydb' }
+  #     config.redis = { :namespace => 'myapp', :size => 25, :url => 'redis://myhost:8877/0' }
   #     config.server_middleware do |chain|
   #       chain.add MyServerHook
   #     end
@@ -56,7 +51,7 @@ module Sidekiq
   # Configuration for Sidekiq client, use like:
   #
   #   Sidekiq.configure_client do |config|
-  #     config.redis = { :namespace => 'myapp', :size => 1, :url => 'redis://myhost:8877/mydb' }
+  #     config.redis = { :namespace => 'myapp', :size => 1, :url => 'redis://myhost:8877/0' }
   #   end
   def self.configure_client
     yield self unless server?
@@ -115,3 +110,9 @@ module Sidekiq
   end
 
 end
+
+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/cli.rb

@@ -127,7 +127,7 @@ module Sidekiq
       # Celluloid can't be loaded until after we've daemonized
       # because it spins up threads and creates locks which get
       # into a very bad state if forked.
-      require 'celluloid'
+      require 'celluloid/autostart'
       Celluloid.logger = (options[:verbose] ? Sidekiq.logger : nil)
 
       require 'sidekiq/manager'

data/lib/sidekiq/extensions/action_mailer.rb

@@ -11,9 +11,6 @@ module Sidekiq
     #    UserMailer.delay_until(5.days.from_now).send_welcome_email(new_user)
     class DelayedMailer
       include Sidekiq::Worker
-      # I think it's reasonable to assume that emails should take less
-      # than 30 seconds to send.
-      sidekiq_options :timeout => 30
 
       def perform(yml)
         (target, method_name, args) = YAML.load(yml)

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

@@ -69,6 +69,8 @@ module Sidekiq
 
           if msg['backtrace'] == true
             msg['error_backtrace'] = e.backtrace
+          elsif msg['backtrace'] == false
+            # do nothing
           elsif msg['backtrace'].to_i != 0
             msg['error_backtrace'] = e.backtrace[0..msg['backtrace'].to_i]
           end

data/lib/sidekiq/processor.rb

@@ -4,7 +4,6 @@ require 'sidekiq/util'
 require 'sidekiq/middleware/server/active_record'
 require 'sidekiq/middleware/server/retry_jobs'
 require 'sidekiq/middleware/server/logging'
-require 'sidekiq/middleware/server/timeout'
 
 module Sidekiq
   ##
@@ -20,7 +19,6 @@ module Sidekiq
         m.add Middleware::Server::Logging
         m.add Middleware::Server::RetryJobs
         m.add Middleware::Server::ActiveRecord
-        m.add Middleware::Server::Timeout
       end
     end
 

data/lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "2.10.1"
+  VERSION = "2.11.0"
 end

data/lib/sidekiq/web.rb

@@ -28,7 +28,7 @@ module Sidekiq
       end
 
       def t(msg, options={})
-        string = strings[get_locale].fetch(msg) || strings['en'].fetch(msg)
+        string = strings[get_locale] ? strings[get_locale].fetch(msg) : strings['en'].fetch(msg)
         string % options
       end
 

data/lib/sidekiq/worker.rb

@@ -51,11 +51,11 @@ module Sidekiq
       #
       #   :queue - use a named queue for this Worker, default 'default'
       #   :retry - enable the RetryJobs middleware for this Worker, default *true*
-      #   :timeout - timeout the perform method after N seconds, default *nil*
       #   :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={})
         self.sidekiq_options_hash = get_sidekiq_options.merge((opts || {}).stringify_keys)
+        ::Sidekiq.logger.warn("#{self.name} - :timeout is unsafe and support has been removed from Sidekiq, see http://bit.ly/OtYpK for details")
       end
 
       DEFAULT_OPTIONS = { 'retry' => true, 'queue' => 'default' }

data/sidekiq.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency                  'redis', '~> 3'
   gem.add_dependency                  'redis-namespace'
   gem.add_dependency                  'connection_pool', '~> 1.0'
-  gem.add_dependency                  'celluloid', '~> 0.12.0'
+  gem.add_dependency                  'celluloid', '~> 0.13.0'
   gem.add_dependency                  'multi_json', '~> 1'
   gem.add_development_dependency      'sinatra'
   gem.add_development_dependency      'slim'

data/test/test_client.rb

@@ -99,7 +99,7 @@ class TestClient < MiniTest::Unit::TestCase
 
     class QueuedWorker
       include Sidekiq::Worker
-      sidekiq_options :queue => :flimflam, :timeout => 1
+      sidekiq_options :queue => :flimflam
     end
 
     it 'enqueues to the named queue' do

data/test/test_web.rb

@@ -29,9 +29,19 @@ class TestWeb < MiniTest::Unit::TestCase
     end
 
     it 'can display workers' do
+      Sidekiq.redis do |conn|
+        identity = 'foo:1234-123abc:default'
+        conn.sadd('workers', identity)
+        conn.setex("worker:#{identity}:started", 10, Time.now.to_s)
+        hash = {:queue => 'critical', :payload => { 'class' => WebWorker.name, 'args' => [1,'abc'] }, :run_at => Time.now.to_i }
+        conn.setex("worker:#{identity}", 10, Sidekiq.dump_json(hash))
+      end
+
       get '/workers'
       assert_equal 200, last_response.status
-      assert_match /status-idle/, last_response.body
+      assert_match /status-active/, last_response.body
+      assert_match /critical/, last_response.body
+      assert_match /WebWorker/, last_response.body
     end
 
     it 'can display queues' do

data/web/locales/ja.yml

@@ -0,0 +1,62 @@
+# elements like %{queue} are variables and should not be translated
+ja:
+  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: エラーバックトレース
+  GoBack: ← 戻る
+  NoScheduledFound: 予定された作業はありません
+  When: いつ
+  ScheduledJobs: 予定された作業
+  idle: アイドル状態
+  active: アクティブ
+  Version: バージョン
+  Connections: 接続
+  MemoryUsage: メモリー容量
+  PeakMemoryUsage: 最大メモリー容量
+  Uptime: Uptime (days)
+  OneWeek: １週
+  OneMonth: 1 ヶ月
+  ThreeMonths: 3 ヶ月
+  SixMonths: 6 ヶ月
+  Batches: Batches
+  Failures: 失敗

data/web/views/index.slim

@@ -7,4 +7,4 @@
   .row
     .span2.pull-right
       form action="#{root_path}reset" method="post"
-        button.btn.btn-primary.btn-block type="submit" title="#{t('Kill9Warning')}" = t('ClearWorkerList')
+        button.btn.btn-primary.btn-block type="submit" = t('ClearWorkerList')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 2.10.1
+  version: 2.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -243,7 +243,6 @@ files:
 - lib/sidekiq/middleware/server/active_record.rb
 - lib/sidekiq/middleware/server/logging.rb
 - lib/sidekiq/middleware/server/retry_jobs.rb
-- lib/sidekiq/middleware/server/timeout.rb
 - lib/sidekiq/paginator.rb
 - lib/sidekiq/processor.rb
 - lib/sidekiq/rails.rb
@@ -293,6 +292,7 @@ files:
 - web/locales/es.yml
 - web/locales/fr.yml
 - web/locales/it.yml
+- web/locales/ja.yml
 - web/locales/pl.yml
 - web/locales/pt-br.yml
 - web/locales/pt.yml

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

@@ -1,21 +0,0 @@
-require 'timeout'
-
-module Sidekiq
-  module Middleware
-    module Server
-      class Timeout
-
-        def call(worker, msg, queue)
-          if msg['timeout'] && msg['timeout'].to_i != 0
-            ::Timeout.timeout(msg['timeout'].to_i) do
-              yield
-            end
-          else
-            yield
-          end
-        end
-
-      end
-    end
-  end
-end