diff options
| author | Tobias Lütke <tobias.luetke@gmail.com> | 2007-04-16 21:55:59 +0000 |
|---|---|---|
| committer | Tobias Lütke <tobias.luetke@gmail.com> | 2007-04-16 21:55:59 +0000 |
| commit | 7722e2bf6c8bc0e81e61a47809cdbbf52b33ce6b (patch) | |
| tree | 257f70101b5ff6d7f5dd0ce2b68c3b70a3b53a47 | |
| parent | 39ccb5e807eadfc9bf6ac780778aa1de4d09e196 (diff) | |
| download | rails-7722e2bf6c8bc0e81e61a47809cdbbf52b33ce6b.tar.gz rails-7722e2bf6c8bc0e81e61a47809cdbbf52b33ce6b.tar.bz2 rails-7722e2bf6c8bc0e81e61a47809cdbbf52b33ce6b.zip | |
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
| -rw-r--r-- | railties/lib/commands/process/spawner.rb | 6 | ||||
| -rw-r--r-- | 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 |