From 91700bfc2dce8a9c473087d206a3498eeecb1ca0 Mon Sep 17 00:00:00 2001 From: kennyj Date: Tue, 31 Jan 2012 21:26:17 +0900 Subject: Fix GH #4760. A Block was not evaluated. --- activesupport/lib/active_support/tagged_logging.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'activesupport/lib') diff --git a/activesupport/lib/active_support/tagged_logging.rb b/activesupport/lib/active_support/tagged_logging.rb index d71215b447..6af87e85e6 100644 --- a/activesupport/lib/active_support/tagged_logging.rb +++ b/activesupport/lib/active_support/tagged_logging.rb @@ -33,13 +33,14 @@ module ActiveSupport deprecate :silence def add(severity, message = nil, progname = nil, &block) - @logger.add(severity, "#{tags_text}#{message}", progname, &block) + message = (block_given? ? block.call : progname) if message.nil? + @logger.add(severity, "#{tags_text}#{message}", progname) end %w( fatal error warn info debug unknown ).each do |severity| eval <<-EOM, nil, __FILE__, __LINE__ + 1 def #{severity}(progname = nil, &block) - add(Logger::#{severity.upcase}, progname, &block) + add(Logger::#{severity.upcase}, nil, progname, &block) end EOM end -- cgit v1.2.3