Support v3 and v4 eager load logic, #1791

sidekiq · Jul 5, 2014 · a9cac85 · a9cac85
1 parent ed3276e
commit a9cac85
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/lib/sidekiq/cli.rb b/lib/sidekiq/cli.rb
@@ -221,13 +221,20 @@ def boot_system
       raise ArgumentError, "#{options[:require]} does not exist" unless File.exist?(options[:require])
 
       if File.directory?(options[:require])
-        # Painful contortions, see 1791 for discussion
-        require File.expand_path("#{options[:require]}/config/application.rb")
-        ::Rails::Application.initializer "sidekiq.eager_load" do
-          ::Rails.application.config.eager_load = true
+        require 'rails'
+        if ::Rails::VERSION::MAJOR < 4
+          require 'sidekiq/rails'
+          require File.expand_path("#{options[:require]}/config/environment.rb")
+          ::Rails.application.eager_load!
+        else
+          # Painful contortions, see 1791 for discussion
+          require File.expand_path("#{options[:require]}/config/application.rb")
+          ::Rails::Application.initializer "sidekiq.eager_load" do
+            ::Rails.application.config.eager_load = true
+          end
+          require 'sidekiq/rails'
+          require File.expand_path("#{options[:require]}/config/environment.rb")
         end
-        require 'sidekiq/rails'
-        require File.expand_path("#{options[:require]}/config/environment.rb")
         options[:tag] ||= default_tag
       else
         require options[:require]

diff --git a/lib/sidekiq/version.rb b/lib/sidekiq/version.rb
@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "3.2.0"
+  VERSION = "3.2.1"
 end