github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-31 09:18:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6531 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Tobias Lütke
2007-04-16 21:55:59 +00:00
parent 39ccb5e807
commit 7722e2bf6c
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
railties/lib/commands/process/spawner.rb
View File

@@ -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',

3
railties/lib/initializer.rb
View File

@@ -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