@@ -72,39 +72,42 @@ module OpenWFE private - def do_log (level, message, &block) + def do_log (level, message, &block) - return unless $OWFE_LOG + return unless $OWFE_LOG - logblock = lambda do - if block - "#{log_prepare(message)} - #{block.call}" - else - "#{log_prepare(message)}" - end + logblock = lambda do + if block + "#{log_prepare(message)} - #{block.call}" + else + "#{log_prepare(message)}" end + end - # If somebody (ActiveSupport) changed the formatter, let's - # undo it. - $OWFE_LOG.formatter = Logger::Formatter.new unless $OWFE_LOG.formatter.class == Logger::Formatter + # If somebody (ActiveSupport) changed the formatter, let's + # undo it. - $OWFE_LOG.send level, &logblock + if $OWFE_LOG.respond_to?(:formatter) && $OWFE_LOG.formatter.class == Logger::Formatter + $OWFE_LOG.formatter = Logger::Formatter.new end - def log_prepare (message) + $OWFE_LOG.send(level, &logblock) + end - return log_author() unless message - "#{log_author} - #{message}" - end + def log_prepare (message) - def log_author + return log_author() unless message + "#{log_author} - #{message}" + end - if respond_to?(:service_name) - "#{self.class} '#{self.service_name}'" - else - "#{self.class}" - end + def log_author + + if respond_to?(:service_name) + "#{self.class} '#{self.service_name}'" + else + "#{self.class}" end + end end lib/openwfe/logging.rb 0a8bd18251de1392cc897f2cd5b27598f540b1a0 John Mettraux jmettraux@gmail.com http://github.com/jmettraux/ruote/commit/82cfc10fa6393c8c5c026552d6929ab0cbaa87d3 82cfc10fa6393c8c5c026552d6929ab0cbaa87d3 2009-06-01T05:51:47-07:00 2009-06-01T05:51:47-07:00 adapting logging to rails 2.3.2 c4dcb8714242b3e2cfb956ee83883d72dcb014df John Mettraux jmettraux@gmail.com