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

Guarantee level_override exists #100

Merged
merged 1 commit into from
Aug 21, 2024
Merged

Guarantee level_override exists #100

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 9 additions & 4 deletions lib/logger.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ class Logger

# Logging severity threshold (e.g. <tt>Logger::INFO</tt>).
def level
@level_override[Fiber.current] || @level
level_override[Fiber.current] || @level
end

# Sets the log level; returns +severity+.
Expand All @@ -406,14 +406,14 @@ def level=(severity)
# logger.debug { "Hello" }
# end
def with_level(severity)
prev, @level_override[Fiber.current] = level, Severity.coerce(severity)
prev, level_override[Fiber.current] = level, Severity.coerce(severity)
begin
yield
ensure
if prev
@level_override[Fiber.current] = prev
level_override[Fiber.current] = prev
else
@level_override.delete(Fiber.current)
level_override.delete(Fiber.current)
end
end
end
Expand Down Expand Up @@ -746,6 +746,11 @@ def format_severity(severity)
SEV_LABEL[severity] || 'ANY'
end

# Guarantee the existence of this ivar even when subclasses don't call the superclass constructor.
def level_override
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you comment that reason to extract level_override as method at this place?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can do.

@level_override ||= {}
end

def format_message(severity, datetime, progname, msg)
(@formatter || @default_formatter).call(severity, datetime, progname, msg)
end
Expand Down