diff options
author | Joshua Peek <josh@joshpeek.com> | 2009-04-14 17:06:32 -0500 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2009-04-14 17:06:32 -0500 |
commit | d7396b5ca9c066cb16158c02b976dab01f522344 (patch) | |
tree | 84d934d8a5f83af8f749117ac9c9bf2d56660249 /actionpack/lib/action_controller | |
parent | 1d2686517c4369c3609be166f0d11970c87099b5 (diff) | |
download | rails-d7396b5ca9c066cb16158c02b976dab01f522344.tar.gz rails-d7396b5ca9c066cb16158c02b976dab01f522344.tar.bz2 rails-d7396b5ca9c066cb16158c02b976dab01f522344.zip |
Move reloader middleware in ActionDispatch
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r-- | actionpack/lib/action_controller/dispatch/dispatcher.rb | 4 | ||||
-rw-r--r-- | actionpack/lib/action_controller/reloader.rb | 14 |
2 files changed, 2 insertions, 16 deletions
diff --git a/actionpack/lib/action_controller/dispatch/dispatcher.rb b/actionpack/lib/action_controller/dispatch/dispatcher.rb index 8ed7de4788..bb9d8bd063 100644 --- a/actionpack/lib/action_controller/dispatch/dispatcher.rb +++ b/actionpack/lib/action_controller/dispatch/dispatcher.rb @@ -5,8 +5,8 @@ module ActionController class << self def define_dispatcher_callbacks(cache_classes) unless cache_classes - unless self.middleware.include?(Reloader) - self.middleware.insert_after(ActionDispatch::Failsafe, Reloader) + unless self.middleware.include?(ActionDispatch::Reloader) + self.middleware.insert_after(ActionDispatch::Failsafe, ActionDispatch::Reloader) end ActionView::Helpers::AssetTagHelper.cache_asset_timestamps = false diff --git a/actionpack/lib/action_controller/reloader.rb b/actionpack/lib/action_controller/reloader.rb deleted file mode 100644 index 46789309cd..0000000000 --- a/actionpack/lib/action_controller/reloader.rb +++ /dev/null @@ -1,14 +0,0 @@ -module ActionController - class Reloader - def initialize(app) - @app = app - end - - def call(env) - Dispatcher.reload_application - @app.call(env) - ensure - Dispatcher.cleanup_application - end - end -end |