From 93fe0ff2f1a2818523799d3da68cade115bec783 Mon Sep 17 00:00:00 2001 From: sonots Date: Thu, 20 Jul 2017 16:47:26 +0000 Subject: [PATCH] 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 [Fix GH-1667] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59380 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/logger.rb | 4 +++- test/logger/test_logger.rb | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) 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