From 4265f1bccbabc293e87cc8433a5573dcb7fa5a60 Mon Sep 17 00:00:00 2001 From: Carson Reinke Date: Thu, 10 Jan 2013 13:36:05 -0500 Subject: Incorrectly providing program name the same as log message even when block is not provided. --- activesupport/lib/active_support/tagged_logging.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'activesupport/lib') diff --git a/activesupport/lib/active_support/tagged_logging.rb b/activesupport/lib/active_support/tagged_logging.rb index 7e7f7ecfb2..6fff3bc0d4 100644 --- a/activesupport/lib/active_support/tagged_logging.rb +++ b/activesupport/lib/active_support/tagged_logging.rb @@ -44,7 +44,14 @@ module ActiveSupport deprecate :silence def add(severity, message = nil, progname = nil, &block) - message = (block_given? ? block.call : progname) if message.nil? + if message.nil? + if block_given? + message = block.call + else + message = progname + progname = nil #No instance variable for this like Logger + end + end @logger.add(severity, "#{tags_text}#{message}", progname) end -- cgit v1.2.3