diff options
| -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 |