@@ -8,7 +8,12 @@ module Merb def self.stop(status = 0) if @server - @server.stop(true) + begin + @server.stop(true) + rescue Mongrel::TimeoutError + Merb.logger.fatal! "Your process took too long to shut " \ + "down, so mongrel killed it." + end true end end lib/merb-core/rack/adapter/mongrel.rb 27779e1f857c3555c87451a1011bbeee646fa1f5 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/205f2436a741841abc92901c015f3c470a5b99b7 205f2436a741841abc92901c015f3c470a5b99b7 2008-09-27T18:27:11-07:00 2008-09-25T23:57:07-07:00 Hide the backtrace for Mongrel timeout errors. 9a40349d32a3489fbd4295b63c3bca455d36d7cf Yehuda Katz wycats@gmail.com