From df002c15761089daf91608ad6848792bb1406178 Mon Sep 17 00:00:00 2001 From: Mike Perham Date: Thu, 28 Apr 2016 10:02:03 -0700 Subject: [PATCH] Update reload API for 5.0.beta4 --- lib/sidekiq/rails.rb | 15 ++------------- myapp/Gemfile | 2 +- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/lib/sidekiq/rails.rb b/lib/sidekiq/rails.rb index eee1338a..c8137293 100644 --- a/lib/sidekiq/rails.rb +++ b/lib/sidekiq/rails.rb @@ -41,21 +41,10 @@ module Sidekiq end def call - ActiveSupport::Dependencies.interlock.running do - begin - ActionDispatch::Reloader.prepare! if do_reload_now = reload_dependencies? - yield - ensure - ActionDispatch::Reloader.cleanup! if do_reload_now - end + @app.reloader.wrap do + yield end end - - private - - def reload_dependencies? - @app.config.reload_classes_only_on_change != true || @app.reloaders.any?(&:updated?) - end end end if defined?(::Rails) end diff --git a/myapp/Gemfile b/myapp/Gemfile index 2a4b0a27..45aceaa9 100644 --- a/myapp/Gemfile +++ b/myapp/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' gem 'sidekiq', :path => '..' -gem 'rails', '5.0.0.beta2' +gem 'rails', '5.0.0.beta4' gem 'rack', '2.0.0.alpha' gem 'sinatra', github: 'sinatra/sinatra'