Skip to content

Commit

Permalink
Merge pull request rails#52132 from skipkayhil/hm-rm-logger-predicates
Browse files Browse the repository at this point in the history
Remove obsolete Logger severity predicates
  • Loading branch information
rafaelfranca committed Jun 26, 2024
2 parents 292c127 + 564e427 commit 6045f25
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ PATH
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
logger
logger (>= 1.4.2)
minitest (>= 5.1)
tzinfo (~> 2.0, >= 2.0.5)
rails (8.0.0.alpha)
Expand Down
2 changes: 1 addition & 1 deletion activesupport/activesupport.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,5 @@ Gem::Specification.new do |s|
s.add_dependency "base64"
s.add_dependency "drb"
s.add_dependency "bigdecimal"
s.add_dependency "logger"
s.add_dependency "logger", ">= 1.4.2"
end
8 changes: 0 additions & 8 deletions activesupport/lib/active_support/logger_thread_safe_level.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,6 @@ module ActiveSupport
module LoggerThreadSafeLevel # :nodoc:
extend ActiveSupport::Concern

Logger::Severity.constants.each do |severity|
class_eval(<<-EOT, __FILE__, __LINE__ + 1)
def #{severity.downcase}? # def debug?
Logger::#{severity} >= level # DEBUG >= level
end # end
EOT
end

def local_level
IsolatedExecutionState[local_level_key]
end
Expand Down
20 changes: 20 additions & 0 deletions activesupport/test/broadcast_logger_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,26 @@ def add(message_level, message = nil, progname = nil, &block)
@adds << [message_level, message, progname] if message_level >= local_level
end

def debug?
level <= ::Logger::DEBUG
end

def info?
level <= ::Logger::INFO
end

def warn?
level <= ::Logger::WARN
end

def error?
level <= ::Logger::ERROR
end

def fatal?
level <= ::Logger::FATAL
end

def close
@closed = true
end
Expand Down

0 comments on commit 6045f25

Please sign in to comment.