diff options
author | Ian Ownbey <ian@inspir.es> | 2009-01-31 22:10:56 -0800 |
---|---|---|
committer | Ian Ownbey <ian@inspir.es> | 2009-01-31 22:10:56 -0800 |
commit | 77123838e7a6110e684353aea3443b2bffe7d731 (patch) | |
tree | 7d1315c01857ab0551eadf7a6f71984a5af328a9 /lib/mongrel.rb | |
parent | fdf376b0da0032390c0e5dd0cf17b597231eba07 (diff) | |
parent | 108218a89c663af1c14cc6ff376464e71639f974 (diff) | |
download | unicorn-77123838e7a6110e684353aea3443b2bffe7d731.tar.gz |
* 'master' of git@github.com:fauna/mongrel: Clean up some logging.
Diffstat (limited to 'lib/mongrel.rb')
-rw-r--r-- | lib/mongrel.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/mongrel.rb b/lib/mongrel.rb index 39659a2..515ae2e 100644 --- a/lib/mongrel.rb +++ b/lib/mongrel.rb @@ -115,7 +115,7 @@ module Mongrel end raise "No REQUEST PATH" if !params[Const::REQUEST_PATH] - + params[Const::PATH_INFO] = params[Const::REQUEST_PATH] params[Const::SCRIPT_NAME] = Const::SLASH @@ -149,12 +149,12 @@ module Mongrel rescue EOFError,Errno::ECONNRESET,Errno::EPIPE,Errno::EINVAL,Errno::EBADF client.close rescue nil rescue HttpParserError => e - logger.error "#HTTP parse error, malformed request (#{params[Const::HTTP_X_FORWARDED_FOR] || client.peeraddr.last}): #{e.inspect}" - logger.error "#REQUEST DATA: #{data.inspect}\n---\nPARAMS: #{params.inspect}\n---\n" + logger.error "HTTP parse error, malformed request (#{params[Const::HTTP_X_FORWARDED_FOR] || client.peeraddr.last}): #{e.inspect}" + logger.error "REQUEST DATA: #{data.inspect}\n---\nPARAMS: #{params.inspect}\n---\n" rescue Errno::EMFILE reap_dead_workers('too many files') rescue Object => e - logger.error "#Read error: #{e.inspect}" + logger.error "Read error: #{e.inspect}" logger.error e.backtrace.join("\n") ensure begin @@ -162,7 +162,7 @@ module Mongrel rescue IOError # Already closed rescue Object => e - logger.error "#Client error: #{e.inspect}" + logger.error "Client error: #{e.inspect}" logger.error e.backtrace.join("\n") end request.body.close! if request and request.body.class == Tempfile @@ -175,7 +175,7 @@ module Mongrel # after the reap is done. It only runs if there are workers to reap. def reap_dead_workers(reason='unknown') if @workers.list.length > 0 - logger.info "#Reaping #{@workers.list.length} threads for slow workers because of '#{reason}'" + logger.info "Reaping #{@workers.list.length} threads for slow workers because of '#{reason}'" error_msg = "Mongrel timed out this thread: #{reason}" mark = Time.now @workers.list.each do |worker| |