Revert "DEV: Redo DiscourseLogstashLogger to not rely on logstash-logger (#27663)" (#27733)

This reverts commit 8e10878e1a37a608b0e1705bf9d0a06a295b8a63.

Something is broken on a friday so reverting first before I pick this up
again next Monday.
This commit is contained in:
Alan Guo Xiang Tan
2024-07-05 17:26:58 +08:00
committed by GitHub
parent 8b963986b3
commit 92d7d24d0f
8 changed files with 65 additions and 141 deletions

View File

@ -102,29 +102,18 @@ Rails.application.config.to_prepare do
end
end
if ENV["ENABLE_LOGSTASH_LOGGER"] == "1"
if ENV["LOGSTASH_URI"]
config.lograge.formatter = Lograge::Formatters::Logstash.new
require "discourse_logstash_logger"
config.lograge.logger =
DiscourseLogstashLogger.logger(
logdev: Rails.root.join("log", "#{Rails.env}.log"),
type: :rails,
customize_event:
lambda do |event|
event["database"] = RailsMultisite::ConnectionManagement.current_db
end,
)
DiscourseLogstashLogger.logger(uri: ENV["LOGSTASH_URI"], type: :rails)
# Stop broadcasting to Rails' default logger
Rails.logger.stop_broadcasting_to(
Rails.logger.broadcasts.find { |logger| logger.is_a?(ActiveSupport::Logger) },
)
Logster.logger.subscribe do |severity, message, progname, opts, &block|
config.lograge.logger.add_with_opts(severity, message, progname, opts, &block)
end
# Remove ActiveSupport::Logger from the chain and replace with Lograge's
# logger
Rails.logger.stop_broadcasting_to(Rails.logger.broadcasts.first)
Rails.logger.broadcast_to(config.lograge.logger)
end
end
end