aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--railties/CHANGELOG2
-rw-r--r--railties/lib/fcgi_handler.rb5
2 files changed, 7 insertions, 0 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 72d9361962..9d96aa9e6e 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fix that FCGIs would leave log files open when asked to shut down by USR2 #3028 [sebastian.kanthak/josh]
+
* Fixed that dispatcher preparation callbacks only run once in production mode. Mock Routes.reload so that dispatcher preparation callback tests run. [Rick]
* Fix syntax error in dispatcher than wrecked failsafe responses. #8625 [mtitorenko]
diff --git a/railties/lib/fcgi_handler.rb b/railties/lib/fcgi_handler.rb
index 85e5ca99b3..5bb26e4598 100644
--- a/railties/lib/fcgi_handler.rb
+++ b/railties/lib/fcgi_handler.rb
@@ -169,6 +169,11 @@ class RailsFCGIHandler
dispatcher_log :info, "restarted"
+ # close resources as they won't be closed by
+ # the OS when using exec
+ logger.close rescue nil
+ RAILS_DEFAULT_LOGGER.close rescue nil
+
exec(command_line)
end