@@ -224,10 +224,21 @@ private # RAILS_ENV in Rails::Initializer.load_environment. ::Rails::Initializer.class_eval do def load_environment_with_passenger + using_default_log_path = + configuration.log_path == + configuration.send(:default_log_path) + if defined?(::RAILS_ENV) Object.send(:remove_const, :RAILS_ENV) end Object.const_set(:RAILS_ENV, (ENV['RAILS_ENV'] || 'development').dup) + + if using_default_log_path + # We've changed the environment, so open the + # correct log file. + configuration.log_path = configuration.send(:default_log_path) + end + load_environment_without_passenger end lib/passenger/railz/application_spawner.rb @@ -2,6 +2,8 @@ RAILS_FRAMEWORK_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../..") module Rails class Initializer + attr_accessor :configuration + def self.run(action = :boot) inst = self.new if inst.respond_to?(action) @@ -9,6 +11,10 @@ module Rails end end + def initialize + @configuration = Configuration.new + end + def boot set_load_path load_environment @@ -24,6 +30,16 @@ module Rails $LOAD_PATH << "#{RAILS_ROOT}/app/controllers" end end + + protected + class Configuration + attr_accessor :log_path + attr_accessor :default_log_path + + def initialize + @log_path = @default_log_path = 'foo.log' + end + end end module VERSION test/stub/vendor_rails/minimal/railties/lib/initializer.rb 41c15f5a74c658e471c56370b643fe1c9b0960c2 Hongli Lai (Phusion) hongli@phusion.nl http://github.com/FooBarWidget/passenger/commit/e7e4f0dae2a157340f3d01bd4e61f900fac4c80b e7e4f0dae2a157340f3d01bd4e61f900fac4c80b 2008-06-11T02:21:49-07:00 2008-06-11T02:21:49-07:00 Open the correct log file if environment.rb sets RAILS_ENV. Fixes issue #49. 36fca176a2b50a962e677249b5e0c4600dfdc880 Hongli Lai (Phusion) hongli@phusion.nl