aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2012-05-29 08:48:00 -0700
committerJosé Valim <jose.valim@gmail.com>2012-05-29 08:48:00 -0700
commit9fa3926e4fd1c3c24a9ecc613b98cde6609f2975 (patch)
tree8333b39bc6618a209c462a53c7286f8a5bcf0da5 /railties/lib/rails/application.rb
parentd46a36805b93478f39039f4cab006f0aabd4cfd0 (diff)
parentc0ba0f01d05844bf3024d3926900706b270adf4d (diff)
downloadrails-9fa3926e4fd1c3c24a9ecc613b98cde6609f2975.tar.gz
rails-9fa3926e4fd1c3c24a9ecc613b98cde6609f2975.tar.bz2
rails-9fa3926e4fd1c3c24a9ecc613b98cde6609f2975.zip
Merge pull request #6518 from kennyj/fix_5847-4
(Try again) Fix #5847 and #4045.
Diffstat (limited to 'railties/lib/rails/application.rb')
-rw-r--r--railties/lib/rails/application.rb11
1 files changed, 11 insertions, 0 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 660e864d2a..32797ee657 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -158,6 +158,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
+
# Stores some of the Rails initial environment parameters which
# will be used by middlewares and engines to configure themselves.
def env_config
@@ -304,6 +312,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"]