kotovalexarian-likes-github/mperham--sidekiq
1
0
Fork 0
mirror of https://github.com/mperham/sidekiq.git synced 2022-11-09 13:52:34 -05:00
Code Releases Activity

Support v3 and v4 eager load logic, #1791

Browse source
This commit is contained in:
Mike Perham 2014-07-05 05:29:20 -07:00
parent ed3276eab7
commit a9cac85baf
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/sidekiq/cli.rb
View file

@ -221,13 +221,20 @@ module Sidekiq
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]

2
lib/sidekiq/version.rb
View file

@ -1,3 +1,3 @@
module Sidekiq
VERSION = "3.2.0"
VERSION = "3.2.1"
end