Added socket cleanup for lighttpd, both before and after [DHH] Added automatic creation of tmp/ when running script/server [DHH] Added silence_stream that'll work on both STDERR or STDOUT or any other stream and deprecated silence_stderr in the process [DHH]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3761 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

3 files changed, 9 insertions, 3 deletions

diff --git a/railties/lib/commands/process/reaper.rb b/railties/lib/commands/process/reaper.rb
index 6da2191d1b..73b6b97f48 100644
--- a/railties/lib/commands/process/reaper.rb
+++ b/railties/lib/commands/process/reaper.rb
@@ -127,4 +127,4 @@ ARGV.options do |opts|
   opts.parse!
 end
 
-ProgramProcess.process_keywords(OPTIONS[:action], OPTIONS[:dispatcher])
+ProgramProcess.process_keywords(OPTIONS[:action], OPTIONS[:dispatcher])
\ No newline at end of file
diff --git a/railties/lib/commands/server.rb b/railties/lib/commands/server.rb
index 310afba689..85e3a64d60 100644
--- a/railties/lib/commands/server.rb
+++ b/railties/lib/commands/server.rb
@@ -25,4 +25,5 @@ else
   puts "=> Booting lighttpd (use 'script/server webrick' to force WEBrick)"
 end
 
+silence_stderr { `rake tmp:create` }
 require "commands/servers/#{server}"
\ No newline at end of file
diff --git a/railties/lib/commands/servers/lighttpd.rb b/railties/lib/commands/servers/lighttpd.rb
index 2bd9a1de14..315fb34ade 100644
--- a/railties/lib/commands/servers/lighttpd.rb
+++ b/railties/lib/commands/servers/lighttpd.rb
@@ -72,6 +72,7 @@ end
 trap(:INT) { exit }
 
 begin
+  `rake tmp:sockets:clear` # Needed if lighttpd crashes or otherwise leaves FCGI sockets around
   `lighttpd #{!detach ? "-D " : ""}-f #{config_file}`
 ensure
   unless detach
@@ -79,7 +80,11 @@ ensure
     puts 'Exiting'
   
     # Ensure FCGI processes are reaped
-    ARGV.replace ['-a', 'kill']
-    require 'commands/process/reaper'
+    silence_stream(STDOUT) do
+      ARGV.replace ['-a', 'kill']
+      require 'commands/process/reaper'
+    end
+
+    `rake tmp:sockets:clear` # Remove sockets on clean shutdown
   end
 end