mirror of
https://github.com/discourse/discourse.git
synced 2025-05-29 23:08:25 +08:00
FIX: Remove references to Rails.logger.chained
`Rails.logger.chained` was provided by Logster before Rails 7.1 introduced their broadcast logger. Now all the loggers are added to `Rails.logger.broadcasts`. Some code in our initializers was still using `chained` instead of `broadcasts`.
This commit is contained in:

committed by
Loïc Guitaut

parent
081b00391e
commit
f595d599dd
@ -19,7 +19,7 @@ if defined?(RailsFailover::Redis)
|
|||||||
SiteSetting.refresh!
|
SiteSetting.refresh!
|
||||||
end
|
end
|
||||||
|
|
||||||
RailsFailover::Redis.logger = Rails.logger.chained.first if Rails.logger.respond_to? :chained
|
RailsFailover::Redis.logger = Rails.logger.broadcasts.first
|
||||||
end
|
end
|
||||||
|
|
||||||
if defined?(RailsFailover::ActiveRecord)
|
if defined?(RailsFailover::ActiveRecord)
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
if GlobalSetting.skip_redis?
|
if GlobalSetting.skip_redis?
|
||||||
Rails.application.reloader.to_prepare do
|
Rails.application.reloader.to_prepare do
|
||||||
Rails.logger = Rails.logger.chained.first if Rails.logger.respond_to? :chained
|
Rails.logger.stop_broadcasting_to(Logster.logger) if defined?(Logster::Logger) && Logster.logger
|
||||||
end
|
end
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
@ -118,10 +118,7 @@ RailsMultisite::ConnectionManagement.each_connection do
|
|||||||
end
|
end
|
||||||
|
|
||||||
if Rails.configuration.multisite
|
if Rails.configuration.multisite
|
||||||
if Rails.logger.respond_to? :chained
|
Rails.logger.broadcasts.first.formatter = RailsMultisite::Formatter.new
|
||||||
chained = Rails.logger.chained
|
|
||||||
chained && chained.first.formatter = RailsMultisite::Formatter.new
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
Logster.config.project_directories = [
|
Logster.config.project_directories = [
|
||||||
|
@ -11,9 +11,9 @@ module DiscourseRackQuietAssetsLogger
|
|||||||
(env["PATH_INFO"].index("/service-worker") == 0) ||
|
(env["PATH_INFO"].index("/service-worker") == 0) ||
|
||||||
(env["PATH_INFO"].index("mini-profiler-resources") == 0) ||
|
(env["PATH_INFO"].index("mini-profiler-resources") == 0) ||
|
||||||
(env["PATH_INFO"].index("/srv/status") == 0)
|
(env["PATH_INFO"].index("/srv/status") == 0)
|
||||||
if ::Logster::Logger === Rails.logger
|
if defined?(::Logster::Logger) && Logster.logger
|
||||||
override = true
|
override = true
|
||||||
Rails.logger.override_level = Logger::ERROR
|
Logster.logger.override_level = Logger::ERROR
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -20,9 +20,9 @@ class SilenceLogger < Rails::Rack::Logger
|
|||||||
if env[HTTP_X_SILENCE_LOGGER] || @opts[:silenced].include?(path_info) ||
|
if env[HTTP_X_SILENCE_LOGGER] || @opts[:silenced].include?(path_info) ||
|
||||||
path_info.start_with?("/logs") || path_info.start_with?("/user_avatar") ||
|
path_info.start_with?("/logs") || path_info.start_with?("/user_avatar") ||
|
||||||
path_info.start_with?("/letter_avatar")
|
path_info.start_with?("/letter_avatar")
|
||||||
if ::Logster::Logger === Rails.logger
|
if defined?(::Logster::Logger) && Logster.logger
|
||||||
override = true
|
override = true
|
||||||
Rails.logger.override_level = Logger::WARN
|
Logster.logger.override_level = Logger::WARN
|
||||||
end
|
end
|
||||||
@app.call(env)
|
@app.call(env)
|
||||||
else
|
else
|
||||||
|
@ -111,8 +111,8 @@ Rails.application.config.to_prepare do
|
|||||||
|
|
||||||
# Remove ActiveSupport::Logger from the chain and replace with Lograge's
|
# Remove ActiveSupport::Logger from the chain and replace with Lograge's
|
||||||
# logger
|
# logger
|
||||||
Rails.logger.chained.pop
|
Rails.logger.stop_broadcasting_to(Rails.logger.broadcasts.last)
|
||||||
Rails.logger.chain(config.lograge.logger)
|
Rails.logger.broadcast_to(config.lograge.logger)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -22,10 +22,6 @@ if Rails.env.production? || ENV["ENABLE_LOGS_TRUNCATION"] == "1"
|
|||||||
end
|
end
|
||||||
|
|
||||||
Rails.application.config.to_prepare do
|
Rails.application.config.to_prepare do
|
||||||
set_or_extend_truncate_logs_formatter(Rails.logger)
|
Rails.logger.broadcasts.each { |logger| set_or_extend_truncate_logs_formatter(logger) }
|
||||||
|
|
||||||
if Rails.logger.respond_to? :chained
|
|
||||||
Rails.logger.chained.each { |logger| set_or_extend_truncate_logs_formatter(logger) }
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -954,14 +954,7 @@ module Discourse
|
|||||||
def self.warn(message, env = nil)
|
def self.warn(message, env = nil)
|
||||||
append = env ? (+" ") << env.map { |k, v| "#{k}: #{v}" }.join(" ") : ""
|
append = env ? (+" ") << env.map { |k, v| "#{k}: #{v}" }.join(" ") : ""
|
||||||
|
|
||||||
if !(Logster::Logger === Rails.logger)
|
loggers = Rails.logger.broadcasts
|
||||||
Rails.logger.warn("#{message}#{append}")
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
loggers = [Rails.logger]
|
|
||||||
loggers.concat(Rails.logger.chained) if Rails.logger.chained
|
|
||||||
|
|
||||||
logster_env = env
|
logster_env = env
|
||||||
|
|
||||||
if old_env = Thread.current[Logster::Logger::LOGSTER_ENV]
|
if old_env = Thread.current[Logster::Logger::LOGSTER_ENV]
|
||||||
|
@ -60,4 +60,8 @@ class FakeLogger
|
|||||||
def add(severity, message = nil, progname = nil)
|
def add(severity, message = nil, progname = nil)
|
||||||
public_send(severities[severity]) << message
|
public_send(severities[severity]) << message
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def broadcasts
|
||||||
|
[self]
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
Reference in New Issue
Block a user