From ff70afb97c7f41e28b3d3f6df665daeb4d415989 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Tue, 16 Aug 2011 19:00:37 -0700 Subject: more consistent logging for errors The Unicorn.log_error method exists since 4.0.0 --- lib/rainbows/coolio/client.rb | 3 ++- lib/rainbows/error.rb | 6 ++---- lib/rainbows/reverse_proxy/coolio.rb | 4 +--- 3 files changed, 5 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/rainbows/coolio/client.rb b/lib/rainbows/coolio/client.rb index 5d2edec..88fd1d4 100644 --- a/lib/rainbows/coolio/client.rb +++ b/lib/rainbows/coolio/client.rb @@ -164,7 +164,8 @@ class Rainbows::Coolio::Client < Coolio::IO begin @deferred.close if @deferred.respond_to?(:close) rescue => e - Rainbows.server.logger.error("closing #@deferred: #{e}") + Unicorn.log_error(Rainbows.server.logger, + "closing deferred=#{@deferred.inspect}", e) end @deferred = nil end diff --git a/lib/rainbows/error.rb b/lib/rainbows/error.rb index 039af9d..8917c4d 100644 --- a/lib/rainbows/error.rb +++ b/lib/rainbows/error.rb @@ -12,15 +12,13 @@ module Rainbows::Error end def self.app(e) - Rainbows.server.logger.error "app error: #{e.inspect}" - Rainbows.server.logger.error e.backtrace.join("\n") + Unicorn.log_error(Rainbows.server.logger, "app error", e) rescue end def self.listen_loop(e) Rainbows.alive or return - Rainbows.server.logger.error "listen loop error: #{e.inspect}." - Rainbows.server.logger.error e.backtrace.join("\n") + Unicorn.log_error(Rainbows.server.logger, "listen loop error", e) rescue end diff --git a/lib/rainbows/reverse_proxy/coolio.rb b/lib/rainbows/reverse_proxy/coolio.rb index 2197958..2a977e0 100644 --- a/lib/rainbows/reverse_proxy/coolio.rb +++ b/lib/rainbows/reverse_proxy/coolio.rb @@ -43,9 +43,7 @@ module Rainbows::ReverseProxy::Coolio return close when SystemCallError else - logger = @env["rack.logger"] - logger.error "#{e} #{e.message}" - e.backtrace.each { |m| logger.error m } + Unicorn.log_error(@env["rack.logger"], "on_readable", e) end @env[AsyncCallback].call(Rainbows::ReverseProxy::E502) close -- cgit v1.2.3-24-ge0c7