Skip to content

Commit 564e427

Browse files
skipkayhilrafaelfranca
authored andcommitted
Remove obsolete Logger severity predicates
The Logger severity predicates have existed since the [introduction of Logger][1]. However, these methods only looked at the `level` instance variable, so they did not work with the [thread safe implementation][2] of temporary log levels in Rails. Since then, the Logger severity predicates were [updated][3] to use the `level` method instead of the instance variable, making Rails' severity predicate overrides obsolete. This commit removes Rails' custom severity predicates in favor of Logger's implementation, since the new implementation was released in Logger 1.4.2 and came bundled with Ruby 2.7.0. [1]: ruby/logger@525b58d [2]: rails/rails@629efb6 [3]: ruby/logger@7365c99
1 parent 292c127 commit 564e427

File tree

4 files changed

+22
-10
lines changed

4 files changed

+22
-10
lines changed

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ PATH
9393
connection_pool (>= 2.2.5)
9494
drb
9595
i18n (>= 1.6, < 2)
96-
logger
96+
logger (>= 1.4.2)
9797
minitest (>= 5.1)
9898
tzinfo (~> 2.0, >= 2.0.5)
9999
rails (8.0.0.alpha)

activesupport/activesupport.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@ Gem::Specification.new do |s|
4242
s.add_dependency "base64"
4343
s.add_dependency "drb"
4444
s.add_dependency "bigdecimal"
45-
s.add_dependency "logger"
45+
s.add_dependency "logger", ">= 1.4.2"
4646
end

activesupport/lib/active_support/logger_thread_safe_level.rb

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,6 @@ module ActiveSupport
77
module LoggerThreadSafeLevel # :nodoc:
88
extend ActiveSupport::Concern
99

10-
Logger::Severity.constants.each do |severity|
11-
class_eval(<<-EOT, __FILE__, __LINE__ + 1)
12-
def #{severity.downcase}? # def debug?
13-
Logger::#{severity} >= level # DEBUG >= level
14-
end # end
15-
EOT
16-
end
17-
1810
def local_level
1911
IsolatedExecutionState[local_level_key]
2012
end

activesupport/test/broadcast_logger_test.rb

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,26 @@ def add(message_level, message = nil, progname = nil, &block)
369369
@adds << [message_level, message, progname] if message_level >= local_level
370370
end
371371

372+
def debug?
373+
level <= ::Logger::DEBUG
374+
end
375+
376+
def info?
377+
level <= ::Logger::INFO
378+
end
379+
380+
def warn?
381+
level <= ::Logger::WARN
382+
end
383+
384+
def error?
385+
level <= ::Logger::ERROR
386+
end
387+
388+
def fatal?
389+
level <= ::Logger::FATAL
390+
end
391+
372392
def close
373393
@closed = true
374394
end

0 commit comments

Comments
 (0)