Skip to content

Clear level overrides in #dup and #clone #137

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Clear level overrides in #dup and #clone #137

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
4576128
Use ObjectSpace::WeakKeyMap for level_override
nevans Oct 1, 2025
1b4e472
Clear level overrides in #dup and #clone
nevans Oct 1, 2025
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
17 changes: 15 additions & 2 deletions lib/logger.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,14 @@ class Logger

include Severity

# Must respond to .new and return a Hash-like object.
# The returned object must respond to #[], #[]=, #delete, #dup, and #clear.
#
# ObjectSpace::WeakKeyMap when supported.
OverrideMap =
defined?(ObjectSpace::WeakKeyMap) ? ObjectSpace::WeakKeyMap : Hash
private_constant :OverrideMap

# Logging severity threshold (e.g. <tt>Logger::INFO</tt>).
def level
level_override[level_key] || @level
Expand Down Expand Up @@ -606,7 +614,7 @@ def initialize(logdev, shift_age = 0, shift_size = 1048576, level: DEBUG,
self.datetime_format = datetime_format
self.formatter = formatter
@logdev = nil
@level_override = {}
@level_override = OverrideMap.new
return unless logdev
case logdev
when File::NULL
Expand Down Expand Up @@ -789,7 +797,12 @@ def level_override
does not call super probably
;;;
end
@level_override ||= {}
@level_override ||= OverrideMap.new
end

def initialize_copy(other)
super
@level_override = @level_override&.clone&.clear
end

def level_key
Expand Down
22 changes: 22 additions & 0 deletions test/logger/test_severity.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,20 +31,31 @@ def test_fiber_local_level
logger.level = INFO # default level
other = Logger.new(nil)
other.level = ERROR # default level
clone = logger.clone # should not be chaged

assert_equal(other.level, ERROR)
logger.with_level(:WARN) do
assert_equal(other.level, ERROR)
assert_equal(logger.level, WARN)
assert_equal(clone.level, INFO)
assert_equal(logger.dup.level, INFO)
assert_equal(logger.clone.level, INFO)
logger.clone.with_level(:FATAL) do
assert_equal(logger.level, WARN)
end

logger.with_level(DEBUG) do # verify reentrancy
assert_equal(logger.level, DEBUG)
assert_equal(clone.level, INFO)

Fiber.new do
assert_equal(logger.level, INFO)
logger.with_level(:WARN) do
assert_equal(other.level, ERROR)
assert_equal(logger.level, WARN)
assert_equal(clone.level, INFO)
assert_equal(logger.dup.level, INFO)
assert_equal(logger.clone.level, INFO)
end
assert_equal(logger.level, INFO)
end.resume
Expand All @@ -67,20 +78,31 @@ def level_key
logger.level = INFO # default level
other = subclass.new(nil)
other.level = ERROR # default level
clone = logger.clone # should not be chaged

assert_equal(other.level, ERROR)
logger.with_level(:WARN) do
assert_equal(other.level, ERROR)
assert_equal(logger.level, WARN)
assert_equal(clone.level, INFO)
assert_equal(logger.dup.level, INFO)
assert_equal(logger.clone.level, INFO)
logger.clone.with_level(:FATAL) do
assert_equal(logger.level, WARN)
end

logger.with_level(DEBUG) do # verify reentrancy
assert_equal(logger.level, DEBUG)
assert_equal(clone.level, INFO)

Fiber.new do
assert_equal(logger.level, DEBUG)
logger.with_level(:WARN) do
assert_equal(other.level, ERROR)
assert_equal(logger.level, WARN)
assert_equal(clone.level, INFO)
assert_equal(logger.dup.level, INFO)
assert_equal(logger.clone.level, INFO)
end
assert_equal(logger.level, DEBUG)
end.resume
Expand Down