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

Refactor Rails 5 integration, per @matthewd

Browse source
This commit is contained in:
Mike Perham 2016-07-01 09:31:08 -07:00
parent 5fd622e666
commit 871626c9b3
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/sidekiq/cli.rb
View file

@ -227,7 +227,7 @@ module Sidekiq
require 'sidekiq/rails'
require File.expand_path("#{options[:require]}/config/environment.rb")
::Rails.application.eager_load!
else
elsif ::Rails::VERSION::MAJOR == 4
# Painful contortions, see 1791 for discussion
require File.expand_path("#{options[:require]}/config/application.rb")
::Rails::Application.initializer "sidekiq.eager_load" do
@ -235,10 +235,10 @@ module Sidekiq
end
require 'sidekiq/rails'
require File.expand_path("#{options[:require]}/config/environment.rb")
if ::Rails::VERSION::MAJOR > 4 && !::Rails.application.config.cache_classes
Sidekiq.options[:reloader] = Sidekiq::Rails::Reloader.new
end
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

2
lib/sidekiq/rails.rb
View file

@ -38,7 +38,7 @@ module Sidekiq
class Reloader
def initialize(app = ::Rails.application)
Sidekiq.logger.debug "Enabling Rails 5+ live code reloading, so hot!"
Sidekiq.logger.debug "Enabling Rails 5+ live code reloading, so hot!" unless app.config.cache_classes
@app = app
end