diff options
author | sonots <sonots@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-07-20 16:47:26 +0000 |
---|---|---|
committer | sonots <sonots@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-07-20 16:47:26 +0000 |
commit | 558099679f2ccaf2627776d1ac3e07d114402665 (patch) | |
tree | fd13db21cbf1b354aabad69dd82b7a188a5f37a1 | |
parent | 162f4fc6a3e33d73ad87e6547a47387aa46d0a00 (diff) | |
download | ruby-558099679f2ccaf2627776d1ac3e07d114402665.tar.gz |
logger.rb: Fix handling progname
Because progname was memoized with ||= a logger call that involved
outputting false would be nil. Example code:
logger = Logger.new(STDOUT)
logger.info(false) # => nil
Perform an explicit nil check instead of ||= so that false will be output.
patched by Gavin Miller <gavingmiller@gmail.com> [Fix GH-1667]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59380 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | lib/logger.rb | 4 | ||||
-rw-r--r-- | test/logger/test_logger.rb | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/logger.rb b/lib/logger.rb index 8be1c26664..f572921db4 100644 --- a/lib/logger.rb +++ b/lib/logger.rb @@ -457,7 +457,9 @@ class Logger if @logdev.nil? or severity < @level return true end - progname ||= @progname + if progname.nil? + progname = @progname + end if message.nil? if block_given? message = yield diff --git a/test/logger/test_logger.rb b/test/logger/test_logger.rb index 628da99447..a153db4a2a 100644 --- a/test/logger/test_logger.rb +++ b/test/logger/test_logger.rb @@ -235,6 +235,10 @@ class TestLogger < Test::Unit::TestCase log = log_add(logger, WARN, nil, "progname?") assert_equal("progname?\n", log.msg) assert_equal("my_progname", log.progname) + # + logger = Logger.new(nil) + log = log_add(logger, INFO, nil, false) + assert_equal("false\n", log.msg) end def test_level_log |