1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Honor Syslog::Logger#level overrides

Browse Source
This commit is contained in:
George Claghorn 2019-09-11 15:47:20 -04:00 committed by Aaron Patterson
parent f5e8d33761
commit 31339ef4f2
Notes: git 2019-09-27 07:02:06 +09:00 
Merged: https://github.com/ruby/ruby/pull/2453
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/syslog/lib/syslog/logger.rb
View File

@ -112,7 +112,7 @@ class Syslog::Logger
end end
def #{meth}? def #{meth}?
@level <= #{level} level <= #{level}
end end
EOM EOM
end end
@ -202,7 +202,7 @@ class Syslog::Logger
def add severity, message = nil, progname = nil, &block def add severity, message = nil, progname = nil, &block
severity ||= ::Logger::UNKNOWN severity ||= ::Logger::UNKNOWN
@level <= severity and level <= severity and
@@syslog.log( (LEVEL_MAP[severity] | @facility), '%s', formatter.call(severity, Time.now, progname, (message || block.call)) ) @@syslog.log( (LEVEL_MAP[severity] | @facility), '%s', formatter.call(severity, Time.now, progname, (message || block.call)) )
true true
end end

15
test/syslog/test_syslog_logger.rb
View File

@ -551,6 +551,21 @@ class TestSyslogLogger < TestSyslogRootLogger
assert_equal facility|Syslog::LOG_DEBUG, msg.priority assert_equal facility|Syslog::LOG_DEBUG, msg.priority
end end
class CustomSyslogLogger < Syslog::Logger
def level
Logger::INFO
end
end
def test_overriding_level
@logger = CustomSyslogLogger.new
log = log_add Logger::INFO, 'msg'
assert_equal 'msg', log.msg
log = log_add Logger::DEBUG, 'msg'
assert_nil log.msg
end
end if defined?(Syslog) end if defined?(Syslog)