diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-24 18:43:04 -0800 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-24 18:43:04 -0800 |
commit | 104f3a57768602289299b3be0fab5b1ed21d7653 (patch) | |
tree | 8e467393ec0541d3db1cacd895e094e995574eb4 /railties | |
parent | d01f75b1f091c37d14ece70cbe5f52f20f25d64c (diff) | |
download | rails-104f3a57768602289299b3be0fab5b1ed21d7653.tar.gz rails-104f3a57768602289299b3be0fab5b1ed21d7653.tar.bz2 rails-104f3a57768602289299b3be0fab5b1ed21d7653.zip |
Add config.preload_frameworks to load all frameworks at startup. Default to false so Rails autoloads itself as it's used.
Diffstat (limited to 'railties')
-rw-r--r-- | railties/CHANGELOG | 2 | ||||
-rw-r--r-- | railties/lib/initializer.rb | 23 |
2 files changed, 25 insertions, 0 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index a586940f22..41aedaeb1e 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *2.3.0 [Edge]* +* Add config.preload_frameworks to load all frameworks at startup. Default to false so Rails autoloads itself as it's used. Turn this on for Passenger and JRuby. Also turned on by config.threadsafe! [Jeremy Kemper] + * Add a rake task to generate dispatchers : rake rails:generate_dispatchers [Pratik] * "rails <app>" will not generate public/dispatch.cgi/fcgi/rb files by default now. Please use "--with-dispatchers" option if you need them. [Yaroslav Markin, Pratik Naik] diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index 82b7b604ae..0f74f9ff88 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -136,6 +136,7 @@ module Rails add_gem_load_paths require_frameworks + preload_frameworks set_autoload_paths add_plugin_load_paths load_environment @@ -264,6 +265,19 @@ module Rails raise e.to_s end + # Preload all frameworks specified by the Configuration#frameworks. + # Used by Passenger to ensure everything's loaded before forking and + # to avoid autoload race conditions in JRuby. + def preload_frameworks + if configuration.preload_frameworks + configuration.frameworks.each do |framework| + # String#classify and #constantize aren't available yet. + toplevel = Object.const_get(framework.to_s.gsub(/(?:^|_)(.)/) { $1.upcase }) + toplevel.load_all! + end + end + end + # Add the load paths used by support functions such as the info controller def add_support_load_paths end @@ -602,6 +616,9 @@ Run `rake gems:install` to install the missing gems. # A stub for setting options on ActiveSupport. attr_accessor :active_support + # Whether to preload all frameworks at startup. + attr_accessor :preload_frameworks + # Whether or not classes should be cached (set to false if you want # application classes to be reloaded on each request) attr_accessor :cache_classes @@ -768,6 +785,7 @@ Run `rake gems:install` to install the missing gems. self.log_level = default_log_level self.view_path = default_view_path self.controller_paths = default_controller_paths + self.preload_frameworks = default_preload_frameworks self.cache_classes = default_cache_classes self.dependency_loading = default_dependency_loading self.whiny_nils = default_whiny_nils @@ -810,6 +828,7 @@ Run `rake gems:install` to install the missing gems. # multiple database connections. Also disables automatic dependency loading # after boot def threadsafe! + self.preload_frameworks = true self.cache_classes = true self.dependency_loading = false self.action_controller.allow_concurrency = true @@ -955,6 +974,10 @@ Run `rake gems:install` to install the missing gems. true end + def default_preload_frameworks + false + end + def default_cache_classes true end |