Merge branch 'master' of github.com:mperham/sidekiq

lib/sidekiq.rb

@@ -150,10 +150,6 @@ module Sidekiq
     Middleware::Chain.new do |m|
       m.add Middleware::Server::Logging
       m.add Middleware::Server::RetryJobs
-      if defined?(::ActiveRecord::Base)
-        require 'sidekiq/middleware/server/active_record'
-        m.add Sidekiq::Middleware::Server::ActiveRecord
-      end
     end
   end
 

lib/sidekiq/cli.rb

@@ -240,7 +240,6 @@ module Sidekiq
         else
           require 'sidekiq/rails'
           require File.expand_path("#{options[:require]}/config/environment.rb")
-          Sidekiq.options[:reloader] = Sidekiq::Rails::Reloader.new
         end
         options[:tag] ||= default_tag
       else

lib/sidekiq/rails.rb

@@ -32,10 +32,43 @@ module Sidekiq
   end
 
   class Rails < ::Rails::Engine
+    # We need to setup this up before any application configuration which might
+    # change Sidekiq middleware.
+    #
+    # This hook happens after `Rails::Application` is inherited within
+    # config/application.rb and before config is touched, usually within the
+    # class block. Definitely before config/environments/*.rb and
+    # config/initializers/*.rb.
+    config.before_configuration do
+      if ::Rails::VERSION::MAJOR < 5 && defined?(::ActiveRecord)
+        Sidekiq.server_middleware do |chain|
+          require 'sidekiq/middleware/server/active_record'
+          chain.add Sidekiq::Middleware::Server::ActiveRecord
+        end
+      end
+    end
+
     initializer 'sidekiq' do
       Sidekiq.hook_rails!
     end
 
+    # We have to add the reloader after initialize to see if cache_classes has
+    # been turned on.
+    #
+    # This hook happens after all initialziers are run, just before returning
+    # from config/environment.rb back to sidekiq/cli.rb.
+    config.after_initialize do
+      if ::Rails::VERSION::MAJOR >= 5
+        # The reloader also takes care of ActiveRecord but is incompatible with
+        # the ActiveRecord middleware so make sure it's not in the chain already.
+        if defined?(Sidekiq::Middleware::Server::ActiveRecord) && Sidekiq.server_middleware.exists?(Sidekiq::Middleware::Server::ActiveRecord)
+          raise ArgumentError, "You are using the Sidekiq ActiveRecord middleware and the new Rails 5 reloader which are incompatible. Please remove the ActiveRecord middleware from your Sidekiq middleware configuration."
+        else
+          Sidekiq.options[:reloader] = Sidekiq::Rails::Reloader.new
+        end
+      end
+    end
+
     class Reloader
       def initialize(app = ::Rails.application)
         Sidekiq.logger.debug "Enabling Rails 5+ live code reloading, so hot!" unless app.config.cache_classes

lib/sidekiq/worker.rb

@@ -64,13 +64,13 @@ module Sidekiq
       #   numeric (like an activesupport time interval).
       def perform_in(interval, *args)
         int = interval.to_f
-        now = Time.now
-        ts = (int < 1_000_000_000 ? (now + interval).to_f : int)
+        now = Time.now.to_f
+        ts = (int < 1_000_000_000 ? now + int : int)
 
         item = { 'class' => self, 'args' => args, 'at' => ts }
 
         # Optimization to enqueue something now that is scheduled to go out now or in the past
-        item.delete('at'.freeze) if ts <= now.to_f
+        item.delete('at'.freeze) if ts <= now
 
         client_push(item)
       end

test/test_scheduling.rb

@@ -11,6 +11,11 @@ class TestScheduling < Sidekiq::Test
       end
     end
 
+    # Assume we can pass any class as time to perform_in
+    class TimeDuck
+      def to_f; 42.0 end
+    end
+
     it 'schedules jobs' do
       ss = Sidekiq::ScheduledSet.new
       ss.clear
@@ -34,6 +39,9 @@ class TestScheduling < Sidekiq::Test
 
       assert Sidekiq::Client.push_bulk('class' => ScheduledWorker, 'args' => [['mike'], ['mike']], 'at' => 600)
       assert_equal 5, ss.size
+
+      assert ScheduledWorker.perform_in(TimeDuck.new, 'samwise')
+      assert_equal 6, ss.size
     end
 
     it 'removes the enqueued_at field when scheduling' do