sidekiq 2.17.4 → 2.17.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0aa7427773926eb8405b61c3f23ca7f76d2c30a
-  data.tar.gz: 4718ae00e33055fa689059cbfa1f9ef376849109
+  metadata.gz: f45fd360f6855464c593e4fb45908eb33dcb0efe
+  data.tar.gz: b635fac989f62f29bd4f7f740343851560bb6829
 SHA512:
-  metadata.gz: fc0f9e9373b76a5c9944e00de83edada7a886181d49ce11f70582cb6a8f2c35514d350dd6987d26abbe92ae91639661d414be1ba76e6f509577fb461c2396319
-  data.tar.gz: d6efd568f255aac569dc64f9de9fe73984a76aaf72413551f977ba1f2037eee4dfc7350209d06bf66fc19a3ab5e8b250985ff27eff3cec8d8ccfcbc494c14d10
+  metadata.gz: b56a2d5b412234622fc5e531c5402d5b9c8251373250eaadaa8c37a3918145d1afd740ee4b9311ce9bcb0fa08fd172a397a5ba3ab97c3271541a11a0524c2898
+  data.tar.gz: d1e0f55a98d11c4d15a4e3bec401ac571e482b1973869c66f7f40a433895aabb8a920085d5341c9ecc0f873d28f76925ea72dffa2884286ad26b61865e80e5a4

data/.travis.yml

@@ -9,5 +9,4 @@ rvm:
   - 2.1.0
 matrix:
   allow_failures:
-    - rvm: jruby-19mode
     - rvm: rbx

data/Changes.md

@@ -1,3 +1,12 @@
+2.17.5
+-----------
+
+- Automatically use the config file found at `config/sidekiq.yml`, if not passed `-C`. [#1481]
+- Store 'retried\_at' and 'failed\_at' timestamps as Floats, not Strings. [#1473]
+- A `USR2` signal will now reopen _all_ logs, using IO#reopen. Thus, instead of creating a new Logger object, 
+  Sidekiq will now just update the existing Logger's file descriptor [#1163].
+- Remove pidfile when shutting down if started with `-P` [#1470]
+
 2.17.4
 -----------
 

data/Gemfile

@@ -7,3 +7,12 @@ platforms :rbx do
   gem 'minitest'                 # if using minitest
   gem 'rubinius-developer_tools' # if using any of coverage, debugger, profiler
 end
+
+platforms :ruby do
+  gem 'sqlite3'
+end
+
+platforms :jruby do
+  gem 'jruby-openssl'
+  gem 'activerecord-jdbcsqlite3-adapter'
+end

data/Pro-Changes.md

@@ -3,6 +3,11 @@ Sidekiq Pro Changelog
 
 Please see [http://sidekiq.org/pro](http://sidekiq.org/pro) for more details and how to buy.
 
+HEAD
+-----------
+
+- Reverse sorting of Batches in Web UI [#1098]
+
 1.4.2
 -----------
 

data/config.ru

@@ -12,7 +12,7 @@ end
 #Sidekiq.redis { |conn| conn.zadd('retry', Time.now.utc.to_f + 3000, MultiJson.encode({
   #'class' => 'HardWorker', 'args' => ['foo', 0.1, Time.now.to_f],
   #'queue' => 'default', 'error_message' => 'No such method', 'error_class' => 'NoMethodError',
-  #'failed_at' => Time.now.utc, 'retry_count' => 0 })) }
+  #'failed_at' => Time.now.to_i, 'retry_count' => 0 })) }
 
 require 'sidekiq/web'
 run Sidekiq::Web

data/lib/sidekiq/actor.rb

@@ -1,7 +1,38 @@
 module Sidekiq
   module Actor
+
+    module ClassMethods
+      def trap_exit(*args)
+      end
+      def new_link(*args)
+        new(*args)
+      end
+    end
+
+    module InstanceMethods
+      def current_actor
+        self
+      end
+      def after(interval)
+      end
+      def alive?
+        !@dead
+      end
+      def terminate
+        @dead = true
+      end
+      def defer
+        yield
+      end
+    end
+
     def self.included(klass)
-      klass.send(:include, Celluloid)
+      if $TESTING
+        klass.__send__(:include, InstanceMethods)
+        klass.__send__(:extend, ClassMethods)
+      else
+        klass.__send__(:include, Celluloid)
+      end
     end
   end
 end

data/lib/sidekiq/api.rb

@@ -203,7 +203,7 @@ module Sidekiq
     end
 
     def [](name)
-      @item.send(:[], name)
+      @item.__send__(:[], name)
     end
   end
 
@@ -257,18 +257,20 @@ module Sidekiq
   class SortedSet
     include Enumerable
 
+    attr_reader :name
+
     def initialize(name)
-      @zset = name
+      @name = name
       @_size = size
     end
 
     def size
-      Sidekiq.redis {|c| c.zcard(@zset) }
+      Sidekiq.redis {|c| c.zcard(name) }
     end
 
     def schedule(timestamp, message)
       Sidekiq.redis do |conn|
-        conn.zadd(@zset, timestamp.to_f.to_s, Sidekiq.dump_json(message))
+        conn.zadd(name, timestamp.to_f.to_s, Sidekiq.dump_json(message))
       end
     end
 
@@ -282,7 +284,7 @@ module Sidekiq
         range_start = page * page_size + offset_size
         range_end   = page * page_size + offset_size + (page_size - 1)
         elements = Sidekiq.redis do |conn|
-          conn.zrange @zset, range_start, range_end, :with_scores => true
+          conn.zrange name, range_start, range_end, :with_scores => true
         end
         break if elements.empty?
         page -= 1
@@ -295,7 +297,7 @@ module Sidekiq
 
     def fetch(score, jid = nil)
       elements = Sidekiq.redis do |conn|
-        conn.zrangebyscore(@zset, score, score)
+        conn.zrangebyscore(name, score, score)
       end
 
       elements.inject([]) do |result, element|
@@ -316,7 +318,7 @@ module Sidekiq
     def delete(score, jid = nil)
       if jid
         elements = Sidekiq.redis do |conn|
-          conn.zrangebyscore(@zset, score, score)
+          conn.zrangebyscore(name, score, score)
         end
 
         elements_with_jid = elements.map do |element|
@@ -325,8 +327,8 @@ module Sidekiq
           if message["jid"] == jid
             _, @_size = Sidekiq.redis do |conn|
               conn.multi do
-                conn.zrem(@zset, element)
-                conn.zcard @zset
+                conn.zrem(name, element)
+                conn.zcard name
               end
             end
           end
@@ -335,8 +337,8 @@ module Sidekiq
       else
         count, @_size = Sidekiq.redis do |conn|
           conn.multi do
-            conn.zremrangebyscore(@zset, score, score)
-            conn.zcard @zset
+            conn.zremrangebyscore(name, score, score)
+            conn.zcard name
           end
         end
         count != 0
@@ -345,7 +347,7 @@ module Sidekiq
 
     def clear
       Sidekiq.redis do |conn|
-        conn.del(@zset)
+        conn.del(name)
       end
     end
   end

data/lib/sidekiq/capistrano2.rb

@@ -40,7 +40,7 @@ Capistrano::Configuration.instance.load do
     task :start, :roles => lambda { fetch(:sidekiq_role) }, :on_no_matching_servers => :continue do
       rails_env = fetch(:rails_env, "production")
       for_each_process do |pid_file, idx|
-        run "cd #{current_path} ; nohup #{fetch(:sidekiq_cmd)} -e #{rails_env} -C #{current_path}/config/sidekiq.yml -i #{idx} -P #{pid_file} >> #{current_path}/log/sidekiq.log 2>&1 &", :pty => false
+        run "cd #{current_path} ; nohup #{fetch(:sidekiq_cmd)} -e #{rails_env} -i #{idx} -P #{pid_file} >> #{current_path}/log/sidekiq.log 2>&1 &", :pty => false
       end
     end
 

data/lib/sidekiq/cli.rb

@@ -108,7 +108,7 @@ module Sidekiq
       when 'USR2'
         if Sidekiq.options[:logfile]
           Sidekiq.logger.info "Received USR2, reopening log file"
-          initialize_logger
+          Sidekiq::Logging.reopen_logs
         end
       when 'TTIN'
         Thread.list.each do |thread|
@@ -179,7 +179,7 @@ module Sidekiq
 
       cfile = opts[:config_file]
       opts = parse_config(cfile).merge(opts) if cfile
-      
+
       opts[:strict] = true if opts[:strict].nil?
 
       options.merge!(opts)
@@ -299,6 +299,7 @@ module Sidekiq
         die 1
       end
       @parser.parse!(argv)
+      opts[:config_file] ||= 'config/sidekiq.yml' if File.exist?('config/sidekiq.yml')
       opts
     end
 
@@ -313,6 +314,9 @@ module Sidekiq
         File.open(path, 'w') do |f|
           f.puts Process.pid
         end
+        at_exit do
+          FileUtils.rm_f path
+        end
       end
     end
 

data/lib/sidekiq/extensions/action_mailer.rb

@@ -14,7 +14,7 @@ module Sidekiq
 
       def perform(yml)
         (target, method_name, args) = YAML.load(yml)
-        msg = target.send(method_name, *args)
+        msg = target.__send__(method_name, *args)
         # The email method can return nil, which causes ActionMailer to return
         # an undeliverable empty message.
         msg.deliver if msg && (msg.to || msg.cc || msg.bcc) && msg.from

data/lib/sidekiq/extensions/active_record.rb

@@ -16,7 +16,7 @@ module Sidekiq
 
       def perform(yml)
         (target, method_name, args) = YAML.load(yml)
-        target.send(method_name, *args)
+        target.__send__(method_name, *args)
       end
     end
 

data/lib/sidekiq/extensions/class_methods.rb

@@ -14,7 +14,7 @@ module Sidekiq
 
       def perform(yml)
         (target, method_name, args) = YAML.load(yml)
-        target.send(method_name, *args)
+        target.__send__(method_name, *args)
       end
     end
 
@@ -36,4 +36,4 @@ module Sidekiq
   end
 end
 
-Module.send(:include, Sidekiq::Extensions::Klass)
+Module.__send__(:include, Sidekiq::Extensions::Klass)

data/lib/sidekiq/fetch.rb

@@ -12,6 +12,8 @@ module Sidekiq
 
     TIMEOUT = 1
 
+    attr_reader :down
+
     def initialize(mgr, options)
       @down = nil
       @mgr = mgr
@@ -47,6 +49,12 @@ module Sidekiq
       end
     end
 
+    private
+
+    def pause
+      sleep(TIMEOUT)
+    end
+
     def handle_fetch_exception(ex)
       if !@down
         logger.error("Error fetching message: #{ex}")
@@ -55,7 +63,7 @@ module Sidekiq
         end
       end
       @down ||= Time.now
-      sleep(TIMEOUT)
+      pause
       after(0) { fetch }
     rescue Task::TerminatedError
       # If redis is down when we try to shut down, all the fetch backlog
@@ -69,6 +77,10 @@ module Sidekiq
       @done = true
     end
 
+    def self.reset # testing only
+      @done = nil
+    end
+
     def self.done?
       @done
     end

data/lib/sidekiq/logging.rb

@@ -42,6 +42,51 @@ module Sidekiq
       @logger = (log ? log : Logger.new('/dev/null'))
     end
 
+    # This reopens ALL logfiles in the process that have been rotated
+    # using logrotate(8) (without copytruncate) or similar tools.
+    # A +File+ object is considered for reopening if it is:
+    #   1) opened with the O_APPEND and O_WRONLY flags
+    #   2) the current open file handle does not match its original open path
+    #   3) unbuffered (as far as userspace buffering goes, not O_SYNC)
+    # Returns the number of files reopened
+    def self.reopen_logs
+      to_reopen = []
+      append_flags = File::WRONLY | File::APPEND
+
+      ObjectSpace.each_object(File) do |fp|
+        begin
+          if !fp.closed? && fp.stat.file? && fp.sync && (fp.fcntl(Fcntl::F_GETFL) & append_flags) == append_flags
+            to_reopen << fp
+          end
+        rescue IOError, Errno::EBADF
+        end
+      end
+
+      nr = 0
+      to_reopen.each do |fp|
+        orig_st = begin
+          fp.stat
+        rescue IOError, Errno::EBADF
+          next
+        end
+
+        begin
+          b = File.stat(fp.path)
+          next if orig_st.ino == b.ino && orig_st.dev == b.dev
+        rescue Errno::ENOENT
+        end
+
+        begin
+          File.open(fp.path, 'a') { |tmpfp| fp.reopen(tmpfp) }
+          fp.sync = true
+          nr += 1
+        rescue IOError, Errno::EBADF
+          # not much we can do...
+        end
+      end
+      nr
+    end
+
     def logger
       Sidekiq::Logging.logger
     end

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

@@ -75,10 +75,10 @@ module Sidekiq
           msg['error_message'] = e.message
           msg['error_class'] = e.class.name
           count = if msg['retry_count']
-            msg['retried_at'] = Time.now.utc
+            msg['retried_at'] = Time.now.to_f
             msg['retry_count'] += 1
           else
-            msg['failed_at'] = Time.now.utc
+            msg['failed_at'] = Time.now.to_f
             msg['retry_count'] = 0
           end
 

data/lib/sidekiq/paginator.rb

@@ -13,7 +13,7 @@ module Sidekiq
 
         case type
         when 'zset'
-          rev = opts.try(:[], :reverse)
+          rev = opts && opts[:reverse]
           total_size, items = conn.multi do
             conn.zcard(key)
             if rev

data/lib/sidekiq/rails.rb

@@ -1,7 +1,7 @@
 module Sidekiq
   def self.hook_rails!
     if defined?(::ActiveRecord)
-      ::ActiveRecord::Base.send(:include, Sidekiq::Extensions::ActiveRecord)
+      ::ActiveRecord::Base.__send__(:include, Sidekiq::Extensions::ActiveRecord)
     end
 
     if defined?(::ActionMailer)

data/lib/sidekiq/tasks/sidekiq.rake

@@ -15,7 +15,7 @@ namespace :load do
     set :sidekiq_pid,             ->{ "tmp/sidekiq.pid" }
 
     # "-d -i INT -P PATH" are added automatically.
-    set :sidekiq_options,       ->{ "-e #{fetch(:rails_env, 'production')} -C #{current_path}/config/sidekiq.yml -L #{current_path}/log/sidekiq.log" }
+    set :sidekiq_options,       ->{ "-e #{fetch(:rails_env, 'production')} -L #{current_path}/log/sidekiq.log" }
 
     set :sidekiq_timeout,       ->{ 10 }
     set :sidekiq_role,            ->{ :app }
@@ -91,10 +91,19 @@ namespace :sidekiq do
       rails_env = fetch(:rails_env, "production")
       within current_path do
         for_each_process do |pid_file, idx|
-          if fetch(:sidekiq_cmd)
-            execute fetch(:sidekiq_cmd), "-d -i #{idx} -P #{pid_full_path(pid_file)} #{fetch(:sidekiq_options)}"
+          if !defined? JRUBY_VERSION
+            if fetch(:sidekiq_cmd)
+              execute fetch(:sidekiq_cmd), "-d -i #{idx} -P #{pid_full_path(pid_file)} #{fetch(:sidekiq_options)}"
+            else
+              execute :bundle, :exec, :sidekiq, "-d -i #{idx} -P #{pid_full_path(pid_file)} #{fetch(:sidekiq_options)}"
+            end
           else
-            execute :bundle, :exec, :sidekiq, "-d -i #{idx} -P #{pid_full_path(pid_file)} #{fetch(:sidekiq_options)}"
+            execute "echo 'Since JRuby doesn't support Process.daemon, Sidekiq will be running without the -d flag."
+            if fetch(:sidekiq_cmd)
+              execute fetch(:sidekiq_cmd), "-i #{idx} -P #{pid_full_path(pid_file)} #{fetch(:sidekiq_options)} >/dev/null 2>&1 &"
+            else
+              execute :bundle, :exec, :sidekiq, "-i #{idx} -P #{pid_full_path(pid_file)} #{fetch(:sidekiq_options)} >/dev/null 2>&1 &"
+            end
           end
         end
       end

data/lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "2.17.4"
+  VERSION = "2.17.5"
 end

data/sidekiq.gemspec

@@ -22,7 +22,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency      'sinatra'
   gem.add_development_dependency      'minitest', '~> 4.2'
   gem.add_development_dependency      'rake'
-  gem.add_development_dependency      'actionmailer', '>= 4.0.0'
-  gem.add_development_dependency      'activerecord', '>= 4.0.0'
+  gem.add_development_dependency      'rails', '>= 4.0.0'
   gem.add_development_dependency      'coveralls'
 end

data/test/helper.rb

@@ -2,6 +2,7 @@ $TESTING = true
 require 'coveralls'
 Coveralls.wear! do
   add_filter "/test/"
+  add_filter "/myapp/"
 end
 
 ENV['RACK_ENV'] = ENV['RAILS_ENV'] = 'test'
@@ -9,6 +10,7 @@ if ENV.has_key?("SIMPLECOV")
   require 'simplecov'
   SimpleCov.start do
     add_filter "/test/"
+    add_filter "/myapp/"
   end
 end
 

data/test/test_api.rb

@@ -381,7 +381,7 @@ class TestApi < Sidekiq::Test
     end
 
     def add_retry(jid = 'bob', at = Time.now.to_f)
-      payload = Sidekiq.dump_json('class' => 'ApiWorker', 'args' => [1, 'mike'], 'queue' => 'default', 'jid' => jid, 'retry_count' => 2, 'failed_at' => Time.now.utc)
+      payload = Sidekiq.dump_json('class' => 'ApiWorker', 'args' => [1, 'mike'], 'queue' => 'default', 'jid' => jid, 'retry_count' => 2, 'failed_at' => Time.now.to_f)
       Sidekiq.redis do |conn|
         conn.zadd('retry', at.to_s, payload)
       end

data/test/test_cli.rb

@@ -30,6 +30,12 @@ class TestCli < Sidekiq::Test
       assert @cli.valid?
     end
 
+    it 'boots rails' do
+      refute defined?(::Rails)
+      @cli.parse(['sidekiq', '-r', './myapp'])
+      assert defined?(::Rails)
+    end
+
     it 'changes concurrency' do
       @cli.parse(['sidekiq', '-c', '60', '-r', './test/fake_env.rb'])
       assert_equal 60, Sidekiq.options[:concurrency]
@@ -288,8 +294,8 @@ class TestCli < Sidekiq::Test
       describe 'when weight is present' do
         it 'concatenates queues by factor of weight and sets strict to false' do
           opts = { strict: true }
-          @cli.send :parse_queues, opts, [['often', 7], ['repeatedly', 3]]
-          @cli.send :parse_queues, opts, [['once']]
+          @cli.__send__ :parse_queues, opts, [['often', 7], ['repeatedly', 3]]
+          @cli.__send__ :parse_queues, opts, [['once']]
           assert_equal (%w[often] * 7 + %w[repeatedly] * 3 + %w[once]), opts[:queues]
           assert !opts[:strict]
         end
@@ -298,8 +304,8 @@ class TestCli < Sidekiq::Test
       describe 'when weight is not present' do
         it 'returns queues and sets strict' do
           opts = { strict: true }
-          @cli.send :parse_queues, opts, [['once'], ['one_time']]
-          @cli.send :parse_queues, opts, [['einmal']]
+          @cli.__send__ :parse_queues, opts, [['once'], ['one_time']]
+          @cli.__send__ :parse_queues, opts, [['einmal']]
           assert_equal %w[once one_time einmal], opts[:queues]
           assert opts[:strict]
         end
@@ -310,7 +316,7 @@ class TestCli < Sidekiq::Test
       describe 'when weight is present' do
         it 'concatenates queue to opts[:queues] weight number of times and sets strict to false' do
           opts = { strict: true }
-          @cli.send :parse_queue, opts, 'often', 7
+          @cli.__send__ :parse_queue, opts, 'often', 7
           assert_equal %w[often] * 7, opts[:queues]
           assert !opts[:strict]
         end
@@ -319,7 +325,7 @@ class TestCli < Sidekiq::Test
       describe 'when weight is not present' do
         it 'concatenates queue to opts[:queues] once and leaves strict true' do
           opts = { strict: true }
-          @cli.send :parse_queue, opts, 'once', nil
+          @cli.__send__ :parse_queue, opts, 'once', nil
           assert_equal %w[once], opts[:queues]
           assert opts[:strict]
         end

data/test/test_client.rb

@@ -226,11 +226,11 @@ class TestClient < Sidekiq::Test
 
   describe 'item normalization' do
     it 'defaults retry to true' do
-      assert_equal true, Sidekiq::Client.new.send(:normalize_item, 'class' => QueuedWorker, 'args' => [])['retry']
+      assert_equal true, Sidekiq::Client.new.__send__(:normalize_item, 'class' => QueuedWorker, 'args' => [])['retry']
     end
 
     it "does not normalize numeric retry's" do
-      assert_equal 2, Sidekiq::Client.new.send(:normalize_item, 'class' => CWorker, 'args' => [])['retry']
+      assert_equal 2, Sidekiq::Client.new.__send__(:normalize_item, 'class' => CWorker, 'args' => [])['retry']
     end
   end
 end

data/test/test_exception_handler.rb

@@ -59,7 +59,7 @@ class TestExceptionHandler < Sidekiq::Test
     end
 
     after do
-      Object.send(:remove_const, "Airbrake") # HACK should probably inject Airbrake etc into this class in the future
+      Object.__send__(:remove_const, "Airbrake") # HACK should probably inject Airbrake etc into this class in the future
     end
 
     it "notifies Airbrake" do
@@ -75,7 +75,7 @@ class TestExceptionHandler < Sidekiq::Test
     end
 
     after do
-      Object.send(:remove_const, "Honeybadger") # HACK should probably inject Honeybadger etc into this class in the future
+      Object.__send__(:remove_const, "Honeybadger") # HACK should probably inject Honeybadger etc into this class in the future
     end
 
     it "notifies Honeybadger" do
@@ -91,7 +91,7 @@ class TestExceptionHandler < Sidekiq::Test
     end
 
     after do
-      Object.send(:remove_const, "ExceptionNotifier")
+      Object.__send__(:remove_const, "ExceptionNotifier")
     end
 
     it "notifies ExceptionNotifier" do
@@ -120,7 +120,7 @@ class TestExceptionHandler < Sidekiq::Test
     end
 
     after do
-      Object.send(:remove_const, "Exceptional")
+      Object.__send__(:remove_const, "Exceptional")
     end
 
     it "notifies Exceptional" do

data/test/test_fetch.rb

@@ -40,5 +40,61 @@ class TestFetcher < Sidekiq::Test
       assert_equal 2, q1.size
       assert_equal 1, q2.size
     end
+
+    describe 'fetching' do
+      before do
+        Sidekiq::Fetcher.reset
+      end
+
+      it 'instantiates' do
+        begin
+          Sidekiq.options[:fetch] = NullFetch
+          mgr = Minitest::Mock.new
+          fetch = Sidekiq::Fetcher.new(mgr, {})
+          fetch.fetch
+          Sidekiq::Fetcher.done!
+        ensure
+          Sidekiq.options[:fetch] = Sidekiq::BasicFetch
+        end
+      end
+
+      class NullFetch
+        def initialize(opts)
+        end
+        def retrieve_work
+        end
+        def self.bulk_requeue(*args)
+        end
+      end
+
+      it 'handles redis network errors' do
+        begin
+          Sidekiq.logger.level = Logger::FATAL
+          Sidekiq.options[:fetch] = ErrorFetch
+          mgr = Minitest::Mock.new
+          fetch = Sidekiq::Fetcher.new(mgr, {})
+          def fetch.pause
+          end
+          refute fetch.down
+          fetch.fetch
+          Sidekiq::Fetcher.done!
+          assert fetch.down
+        ensure
+          Sidekiq.options[:fetch] = Sidekiq::BasicFetch
+          Sidekiq.logger.level = Logger::ERROR
+        end
+      end
+
+      class ErrorFetch
+        def initialize(opts)
+        end
+        def retrieve_work
+          raise IOError, "ker-BOOM"
+        end
+        def self.bulk_requeue(*args)
+        end
+      end
+    end
+
   end
 end

data/test/test_redis_connection.rb

@@ -77,7 +77,7 @@ class TestRedisConnection < Sidekiq::Test
         ENV[v] = nil
       end
       ENV[var] = uri
-      assert_equal uri, Sidekiq::RedisConnection.send(:determine_redis_provider)
+      assert_equal uri, Sidekiq::RedisConnection.__send__(:determine_redis_provider)
       ENV[var] = nil
     end
 

data/test/test_retry.rb

@@ -129,7 +129,7 @@ class TestRetry < Sidekiq::Test
 
     it 'handles a recurring failed message' do
       @redis.expect :zadd, 1, ['retry', String, String]
-      now = Time.now.utc
+      now = Time.now.to_f
       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
@@ -147,7 +147,7 @@ class TestRetry < Sidekiq::Test
 
     it 'handles a recurring failed message before reaching user-specifed max' do
       @redis.expect :zadd, 1, ['retry', String, String]
-      now = Time.now.utc
+      now = Time.now.to_f
       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
@@ -164,7 +164,7 @@ class TestRetry < Sidekiq::Test
     end
 
     it 'throws away old messages after too many retries (using the default)' do
-      now = Time.now.utc
+      now = Time.now.to_f
       msg = {"class"=>"Bob", "args"=>[1, 2, "foo"], "queue"=>"default", "error_message"=>"kerblammo!", "error_class"=>"RuntimeError", "failed_at"=>now, "retry"=>true, "retry_count"=>25}
       @redis.expect :zadd, 1, [ 'retry', String, String ]
       handler = Sidekiq::Middleware::Server::RetryJobs.new
@@ -178,7 +178,7 @@ class TestRetry < Sidekiq::Test
     end
 
     it 'throws away old messages after too many retries (using user-specified max)' do
-      now = Time.now.utc
+      now = Time.now.to_f
       msg = {"class"=>"Bob", "args"=>[1, 2, "foo"], "queue"=>"default", "error_message"=>"kerblammo!", "error_class"=>"RuntimeError", "failed_at"=>now, "retry"=>3, "retry_count"=>3}
       @redis.expect :zadd, 1, [ 'retry', String, String ]
       handler = Sidekiq::Middleware::Server::RetryJobs.new
@@ -194,7 +194,7 @@ class TestRetry < Sidekiq::Test
     describe "retry exhaustion" do
       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} }
+      let(:msg){ {"class"=>"Bob", "args"=>[1, 2, "foo"], "queue"=>"default", "error_message"=>"kerblammo!", "error_class"=>"RuntimeError", "failed_at"=>Time.now.to_f, "retry"=>3, "retry_count"=>3} }
 
       describe "worker method" do
         let(:worker) do
@@ -210,7 +210,7 @@ class TestRetry < Sidekiq::Test
         end
 
         it 'calls worker.retries_exhausted after too many retries' do
-          assert_equal [1,2, "foo", "retried_method"], handler.send(:retries_exhausted, worker.new, msg)
+          assert_equal [1,2, "foo", "retried_method"], handler.__send__(:retries_exhausted, worker.new, msg)
         end
       end
 
@@ -226,7 +226,7 @@ class TestRetry < Sidekiq::Test
         end
 
         it 'calls worker sidekiq_retries_exhausted_block after too many retries' do
-          new_msg      = handler.send(:retries_exhausted, worker.new, msg)
+          new_msg      = handler.__send__(: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"
@@ -288,15 +288,15 @@ class TestRetry < Sidekiq::Test
       let(:handler) { Sidekiq::Middleware::Server::RetryJobs.new }
 
       it "retries with a default delay" do
-        refute_equal 4, handler.send(:delay_for, worker, 2)
+        refute_equal 4, handler.__send__(:delay_for, worker, 2)
       end
 
       it "retries with a custom delay" do
-        assert_equal 4, handler.send(:delay_for, custom_worker, 2)
+        assert_equal 4, handler.__send__(:delay_for, custom_worker, 2)
       end
 
       it "falls back to the default retry on exception" do
-        refute_equal 4, handler.send(:delay_for, error_worker, 2)
+        refute_equal 4, handler.__send__(: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

data/test/test_web.rb

@@ -412,7 +412,7 @@ class TestWeb < Sidekiq::Test
               'error_message' => 'Some fake message',
               'error_class' => 'RuntimeError',
               'retry_count' => 0,
-              'failed_at' => Time.now.utc,
+              'failed_at' => Time.now.to_f,
               'jid' => SecureRandom.hex(12) }
       score = Time.now.to_f
       Sidekiq.redis do |conn|
@@ -428,7 +428,7 @@ class TestWeb < Sidekiq::Test
               'error_message' => 'fail message: <a>hello</a>',
               'error_class' => 'RuntimeError',
               'retry_count' => 0,
-              'failed_at' => Time.now.utc,
+              'failed_at' => Time.now.to_f,
               'jid' => SecureRandom.hex(12) }
       score = Time.now.to_f
       Sidekiq.redis do |conn|

data/web/locales/fr.yml

@@ -2,7 +2,7 @@
 fr:
   Dashboard: Tableau de Bord
   Status: État
-  Time: Temps
+  Time: Heure
   Namespace: Namespace
   Realtime: Temps Réel
   History: Historique

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 2.17.4
+  version: 2.17.5
 platform: ruby
 authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-01 00:00:00.000000000 Z
+date: 2014-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -123,21 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: actionmailer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-- !ruby/object:Gem::Dependency
-  name: activerecord
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='