Skip to content

Commit

Permalink
Introduce RELATIVE_RAILS_ROOT and changed spawner script to use it. P…
Browse files Browse the repository at this point in the history
…rior 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
  • Loading branch information
Tobias Lütke committed Apr 16, 2007
1 parent 39ccb5e commit 7722e2b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
6 changes: 3 additions & 3 deletions railties/lib/commands/process/spawner.rb
Expand Up @@ -114,9 +114,9 @@ def self.can_bind_to_custom_address?
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',
Expand Down
3 changes: 2 additions & 1 deletion railties/lib/initializer.rb
Expand Up @@ -502,7 +502,8 @@ def set_root_path!
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

Expand Down

0 comments on commit 7722e2b

Please sign in to comment.