diff options
| author | kennyj <kennyj@gmail.com> | 2012-05-29 23:31:27 +0900 |
|---|---|---|
| committer | Ben Holley <benolee@gmail.com> | 2012-12-16 00:06:43 -0600 |
| commit | 38af3540ae53b9f2fbdb649a68cde3edf182fe67 (patch) | |
| tree | 98ce599950855ef8e08d8aef7f7cf2769f478a8f /railties/lib/rails/application.rb | |
| parent | df048b574b5ab5a449a3b1dfc50dbf3baa18869e (diff) | |
| download | rails-38af3540ae53b9f2fbdb649a68cde3edf182fe67.tar.gz rails-38af3540ae53b9f2fbdb649a68cde3edf182fe67.tar.bz2 rails-38af3540ae53b9f2fbdb649a68cde3edf182fe67.zip | |
backport runner fixes to 3-2-stable
Add a runner hook to Rails::Application and Rails::Engine that requires
ActiveRecord::Base to avoid circular constant loading when using observers.
This commit backports cc7dd66, c0ba0f0 and 8d01c61.
Diffstat (limited to 'railties/lib/rails/application.rb')
| -rw-r--r-- | railties/lib/rails/application.rb | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index 854ac2cbbc..cc53009e80 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -154,6 +154,14 @@ module Rails self end + # Load the application runner and invoke the registered hooks. + # Check <tt>Rails::Railtie.runner</tt> for more info. + def load_runner(app=self) + initialize_runner + super + self + end + # Rails.application.env_config stores some of the Rails initial environment parameters. # Currently stores: # @@ -305,6 +313,9 @@ module Rails require "rails/console/helpers" end + def initialize_runner #:nodoc: + end + def build_original_fullpath(env) path_info = env["PATH_INFO"] query_string = env["QUERY_STRING"] |