diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-07-01 11:36:19 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-07-01 11:36:19 -0700 |
| commit | b9771813e37c0034744d4c5b8c0896b2aadbcc80 (patch) | |
| tree | 9a47b2bb2008e2334b20f9d375f99326a70e0c12 /activesupport/lib | |
| parent | 9a8f59340b86151b183d6561a94b953371c3daf3 (diff) | |
| parent | 4265f1bccbabc293e87cc8433a5573dcb7fa5a60 (diff) | |
| download | rails-b9771813e37c0034744d4c5b8c0896b2aadbcc80.tar.gz rails-b9771813e37c0034744d4c5b8c0896b2aadbcc80.tar.bz2 rails-b9771813e37c0034744d4c5b8c0896b2aadbcc80.zip | |
Merge pull request #8881 from carsonreinke/3-2-stable
3-2-stable ActiveSupport::TaggedLogging logging progname issue
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/tagged_logging.rb | 9 |
1 files changed, 8 insertions, 1 deletions
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 |