aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
Diffstat (limited to 'railties')
-rw-r--r--railties/CHANGELOG2
-rw-r--r--railties/lib/commands/servers/lighttpd.rb4
2 files changed, 4 insertions, 2 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 431b99862a..ca4f75eb1f 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Remove hardcoded path to reaper script in script/server [Jeremy Kemper]
+
* Update script.aculo.us to V1.5.3 [Thomas Fuchs]
* Added SIGTRAP signal handler to RailsFCGIHandler that'll force the process into a breakpoint after the next request. This breakpoint can then be caught with script/breakpointer and give you access to the Ruby image inside that process. Useful for debugging memory leaks among other things [DHH]
diff --git a/railties/lib/commands/servers/lighttpd.rb b/railties/lib/commands/servers/lighttpd.rb
index efb7bb1c27..96304a75c1 100644
--- a/railties/lib/commands/servers/lighttpd.rb
+++ b/railties/lib/commands/servers/lighttpd.rb
@@ -67,7 +67,7 @@ ensure
puts 'Exiting'
# Ensure FCGI processes are reaped
- path_to_ruby = "#{Config::CONFIG['bindir']}/#{Config::CONFIG['ruby_install_name']}"
- `#{path_to_ruby} #{RAILS_ROOT}/script/process/reaper -a kill`
+ ARGV.replace ['-a', 'kill']
+ require 'commands/process/reaper'
end
end