From 7722e2bf6c8bc0e81e61a47809cdbbf52b33ce6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20L=C3=BCtke?= Date: Mon, 16 Apr 2007 21:55:59 +0000 Subject: Introduce RELATIVE_RAILS_ROOT and changed spawner script to use it. Prior to this change spawner would assume the non symlinked deploy directory which made reaper reload the wrong code after further deployments. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6531 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- railties/lib/commands/process/spawner.rb | 6 +++--- railties/lib/initializer.rb | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/railties/lib/commands/process/spawner.rb b/railties/lib/commands/process/spawner.rb index 0a34bd6e4b..8fdfab945a 100644 --- a/railties/lib/commands/process/spawner.rb +++ b/railties/lib/commands/process/spawner.rb @@ -114,9 +114,9 @@ end OPTIONS = { :environment => "production", :spawner => '/usr/bin/env spawn-fcgi', - :dispatcher => File.expand_path(RAILS_ROOT + '/public/dispatch.fcgi'), - :pids => File.expand_path(RAILS_ROOT + "/tmp/pids"), - :rails_root => File.expand_path(RAILS_ROOT), + :dispatcher => File.expand_path(RELATIVE_RAILS_ROOT + '/public/dispatch.fcgi'), + :pids => File.expand_path(RELATIVE_RAILS_ROOT + "/tmp/pids"), + :rails_root => File.expand_path(RELATIVE_RAILS_ROOT), :process => "dispatch", :port => 8000, :address => '0.0.0.0', diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index 6b9a5ae2ae..b391be6acc 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -502,7 +502,8 @@ module Rails else Pathname.new(::RAILS_ROOT).realpath.to_s end - + + Object.const_set(:RELATIVE_RAILS_ROOT, ::RAILS_ROOT.dup) unless defined?(::RELATIVE_RAILS_ROOT) ::RAILS_ROOT.replace @root_path end -- cgit v1.2.3