Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Let File::NULL ("/dev/null", "NUL" etc.) be considered a nil log device #47

Merged
merged 2 commits into from
Mar 29, 2020
+14 −2
Merged

Let File::NULL ("/dev/null", "NUL" etc.) be considered a nil log device #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b42a1b9
Let File::NULL ("/dev/null", "NUL" etc.) be considered a nil log device
methodmissing Mar 28, 2020
da7bf84
Let Logger#reopen not raise on nil log devices
methodmissing Mar 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/logger.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ def initialize(logdev, shift_age = 0, shift_size = 1048576, level: DEBUG,
self.datetime_format = datetime_format
self.formatter = formatter
@logdev = nil
if logdev
if logdev && logdev != File::NULL
@logdev = LogDevice.new(logdev, shift_age: shift_age,
shift_size: shift_size,
shift_period_suffix: shift_period_suffix,
Expand All @@ -410,7 +410,7 @@ def initialize(logdev, shift_age = 0, shift_size = 1048576, level: DEBUG,
# Reopen a log device.
#
def reopen(logdev = nil)
@logdev.reopen(logdev)
@logdev&.reopen(logdev)
self
end

Expand Down
12 changes: 12 additions & 0 deletions test/logger/test_logger.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,13 @@ def test_reopen
assert_equal(STDOUT, logger.instance_variable_get(:@logdev).dev)
end

def test_reopen_nil_logdevice
logger = Logger.new(File::NULL)
assert_nothing_raised do
logger.reopen(STDOUT)
end
end

def test_add
logger = Logger.new(nil)
logger.progname = "my_progname"
Expand Down Expand Up @@ -378,4 +385,9 @@ def test_overriding_level
log = log(logger, :debug) { "msg" }
assert_nil log.msg
end

def test_does_not_instantiate_log_device_for_File_NULL
l = Logger.new(File::NULL)
assert_nil(l.instance_variable_get(:@logdev))
end
end