aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorRyan Duryea <ryan.duryea@avanta.com>2010-05-04 11:49:22 -0700
committerJosé Valim <jose.valim@gmail.com>2010-06-20 00:57:15 +0200
commitbb324693ab8e197b369b90e2c3b46d67395a58e5 (patch)
treea05c57e317c6e4a0fac6120e26fd5057c0c5d5dc /railties/lib/rails
parentbb6cd6d3ec02996c7dd11a4bb96381da18b7de8a (diff)
downloadrails-bb324693ab8e197b369b90e2c3b46d67395a58e5.tar.gz
rails-bb324693ab8e197b369b90e2c3b46d67395a58e5.tar.bz2
rails-bb324693ab8e197b369b90e2c3b46d67395a58e5.zip
Pass rack the absolute path of server's pid file
When running as a daemon, rack will cd to "/" and paths relative to the root of the rails app aren't valid when rack is setting up. Because of this, "rails server -d" was failing silently when trying to write it's pid file Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/commands/server.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index 3f74cd49fc..861baa297e 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -83,7 +83,7 @@ module Rails
:environment => (ENV['RAILS_ENV'] || "development").dup,
:daemonize => false,
:debugger => false,
- :pid => "tmp/pids/server.pid"
+ :pid => File.expand_path("tmp/pids/server.pid")
})
end
end