aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorRyan Duryea <ryan.duryea@avanta.com>2010-05-05 11:42:10 -0700
committerJosé Valim <jose.valim@gmail.com>2010-06-20 00:57:29 +0200
commit73df48083a8e0bdb10752c1b481549caac35b6cf (patch)
tree43564f622c571024be7d38fff178159bbb36eb3a /railties
parentbb324693ab8e197b369b90e2c3b46d67395a58e5 (diff)
downloadrails-73df48083a8e0bdb10752c1b481549caac35b6cf.tar.gz
rails-73df48083a8e0bdb10752c1b481549caac35b6cf.tar.bz2
rails-73df48083a8e0bdb10752c1b481549caac35b6cf.zip
Added absolute path for config.ru as well. Turns out this is also needed to fix the daemon issue under ruby 1.8.7
[#4531 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/commands/server.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index 861baa297e..cb9b871875 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -83,7 +83,8 @@ module Rails
:environment => (ENV['RAILS_ENV'] || "development").dup,
:daemonize => false,
:debugger => false,
- :pid => File.expand_path("tmp/pids/server.pid")
+ :pid => File.expand_path("tmp/pids/server.pid"),
+ :config => File.expand_path("config.ru")
})
end
end