From 5d415e590749bc158de6d53d35373f5a9528c2b3 Mon Sep 17 00:00:00 2001
From: evanweaver <evanweaver@19e92222-5c0b-0410-8929-a290d50e31e9>
Date: Thu, 18 Oct 2007 18:45:56 +0000
Subject: no reason not to always print the backtrace for those errors

git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@684 19e92222-5c0b-0410-8929-a290d50e31e9
---
 lib/mongrel.rb              | 20 ++++++++------------
 lib/mongrel/configurator.rb |  2 --
 lib/mongrel/debug.rb        |  4 ----
 3 files changed, 8 insertions(+), 18 deletions(-)

(limited to 'lib')

diff --git a/lib/mongrel.rb b/lib/mongrel.rb
index 7178ec1..1d95714 100644
--- a/lib/mongrel.rb
+++ b/lib/mongrel.rb
@@ -4,8 +4,6 @@
 # Additional work donated by contributors.  See http://mongrel.rubyforge.org/attributions.html 
 # for more information.
 
-$mongrel_debug_client = false
-
 require 'rubygems'
 require 'socket'
 require 'http11'
@@ -269,8 +267,8 @@ module Mongrel
           update_request_progress(remain, total)
         end
       rescue Object
-        STDERR.puts "ERROR reading http body: #$!"
-        STDERR.puts $!.backtrace.join("\n") if $mongrel_debug_client
+        STDERR.puts "#{Time.now}: Error reading HTTP body: #$!"
+        STDERR.puts $!.backtrace.join("\n")
         # any errors means we should delete the file, including if the file is dumped
         @socket.close rescue nil
         @body.delete if @body.class == Tempfile
@@ -660,15 +658,13 @@ module Mongrel
       rescue EOFError,Errno::ECONNRESET,Errno::EPIPE,Errno::EINVAL,Errno::EBADF
         client.close rescue nil
       rescue HttpParserError
-        STDERR.puts "#{Time.now}: HTTP PARSE ERROR, MALFORMED REQUEST (#{params[Const::HTTP_X_FORWARDED_FOR] || client.peeraddr.last}): #$!"
-        if $mongrel_debug_client
-          STDERR.puts "#{Time.now}: REQUEST DATA: #{data.inspect}\n---\nPARAMS: #{params.inspect}\n---\n"
-        end
+        STDERR.puts "#{Time.now}: HTTP parse error, malformed request (#{params[Const::HTTP_X_FORWARDED_FOR] || client.peeraddr.last}): #$!"
+        STDERR.puts "#{Time.now}: REQUEST DATA: #{data.inspect}\n---\nPARAMS: #{params.inspect}\n---\n"
       rescue Errno::EMFILE
         reap_dead_workers('too many files')
       rescue Object
-        STDERR.puts "#{Time.now}: ERROR: #$!"
-        STDERR.puts $!.backtrace.join("\n") if $mongrel_debug_client
+        STDERR.puts "#{Time.now}: Error: #$!"
+        STDERR.puts $!.backtrace.join("\n")
       ensure
         client.close rescue nil
         request.body.delete if request and request.body.class == Tempfile
@@ -768,8 +764,8 @@ module Mongrel
             # client closed the socket even before accept
             client.close rescue nil
           rescue Object => exc
-            STDERR.puts "!!!!!! UNHANDLED EXCEPTION! #{exc}.  TELL ZED HE'S A MORON."
-            STDERR.puts $!.backtrace.join("\n") if $mongrel_debug_client
+            STDERR.puts "** unhandled exception; please report to the Mongrel team."
+            STDERR.puts $!.backtrace.join("\n")
           end
         end
         graceful_shutdown
diff --git a/lib/mongrel/configurator.rb b/lib/mongrel/configurator.rb
index b00e84d..19ea125 100644
--- a/lib/mongrel/configurator.rb
+++ b/lib/mongrel/configurator.rb
@@ -369,8 +369,6 @@ module Mongrel
       if RUBY_PLATFORM !~ /mswin/
         # graceful shutdown
         trap("TERM") { log "TERM signal received."; stop }
-        trap("USR1") { log "USR1 received, toggling $mongrel_debug_client to #{!$mongrel_debug_client}"; $mongrel_debug_client = !$mongrel_debug_client }
-        # restart
         trap("USR2") { log "USR2 signal received."; stop(true) }
 
         log "Signals ready.  TERM => stop.  USR2 => restart.  INT => stop (no restart)."
diff --git a/lib/mongrel/debug.rb b/lib/mongrel/debug.rb
index 572696e..99bbe4c 100644
--- a/lib/mongrel/debug.rb
+++ b/lib/mongrel/debug.rb
@@ -8,10 +8,6 @@ require 'logger'
 require 'set'
 require 'socket'
 
-
-
-$mongrel_debugging=true
-
 module MongrelDbg
   SETTINGS = { :tracing => {}}
   LOGGING = { }
-- 
cgit v1.2.3-24-ge0c7