mirror of
https://github.com/discourse/discourse.git
synced 2024-11-26 04:23:37 +08:00
8e10878e1a
This commit rewrites `DiscourseLogstashLogger` to not be an instance
of `LogstashLogger`. The reason we don't want it to be an instance of
`LogstashLogger` is because we want the new logger to be chained to
Logster's logger which can then pass down useful information like the
request's env and error backtraces which Logster has already gathered.
Note that this commit does not bother to maintain backwards
compatibility and drops the `LOGSTASH_URI` and `UNICORN_LOGSTASH_URI`
ENV variables which were previously used to configure the destination in
which `logstash-logger` would send the logs to. Instead, we introduce
the `ENABLE_LOGSTASH_LOGGER` ENV variable to replace both ENV and remove
the need for the log paths to be specified. Note that the previous
feature was considered experimental as stated in d888d3c54c
and the new feature should be considered experimental as well. The code
may be moved into a plugin in the future.
132 lines
3.9 KiB
Ruby
132 lines
3.9 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
Rails.application.config.to_prepare do
|
|
if (Rails.env.production? && SiteSetting.logging_provider == "lograge") ||
|
|
(ENV["ENABLE_LOGRAGE"] == "1")
|
|
require "lograge"
|
|
|
|
if Rails.configuration.multisite
|
|
Rails.logger.formatter =
|
|
ActiveSupport::Logger::SimpleFormatter.new.extend(ActiveSupport::TaggedLogging::Formatter)
|
|
end
|
|
|
|
Rails.application.configure do
|
|
config.lograge.enabled = true
|
|
|
|
Lograge.ignore(
|
|
lambda do |event|
|
|
# this is our hijack magic status,
|
|
# no point logging this cause we log again
|
|
# direct from hijack
|
|
event.payload[:status] == 418
|
|
end,
|
|
)
|
|
|
|
config.lograge.custom_payload do |controller|
|
|
begin
|
|
username =
|
|
begin
|
|
controller.current_user&.username if controller.respond_to?(:current_user)
|
|
rescue Discourse::InvalidAccess, Discourse::ReadOnly, ActiveRecord::ReadOnlyError
|
|
nil
|
|
end
|
|
|
|
ip =
|
|
begin
|
|
controller.request.remote_ip
|
|
rescue ActionDispatch::RemoteIp::IpSpoofAttackError
|
|
nil
|
|
end
|
|
|
|
{ ip: ip, username: username }
|
|
rescue => e
|
|
Rails.logger.warn(
|
|
"Failed to append custom payload: #{e.message}\n#{e.backtrace.join("\n")}",
|
|
)
|
|
{}
|
|
end
|
|
end
|
|
|
|
config.lograge.custom_options =
|
|
lambda do |event|
|
|
begin
|
|
exceptions = %w[controller action format id]
|
|
|
|
params = event.payload[:params].except(*exceptions)
|
|
|
|
if (file = params[:file]) && file.respond_to?(:headers)
|
|
params[:file] = file.headers
|
|
end
|
|
|
|
if (files = params[:files]) && files.respond_to?(:map)
|
|
params[:files] = files.map { |f| f.respond_to?(:headers) ? f.headers : f }
|
|
end
|
|
|
|
output = {
|
|
params: params.to_query,
|
|
database: RailsMultisite::ConnectionManagement.current_db,
|
|
}
|
|
|
|
if data = (Thread.current[:_method_profiler] || event.payload[:timings])
|
|
sql = data[:sql]
|
|
|
|
if sql
|
|
output[:db] = sql[:duration] * 1000
|
|
output[:db_calls] = sql[:calls]
|
|
end
|
|
|
|
redis = data[:redis]
|
|
|
|
if redis
|
|
output[:redis] = redis[:duration] * 1000
|
|
output[:redis_calls] = redis[:calls]
|
|
end
|
|
|
|
net = data[:net]
|
|
|
|
if net
|
|
output[:net] = net[:duration] * 1000
|
|
output[:net_calls] = net[:calls]
|
|
end
|
|
end
|
|
|
|
output
|
|
rescue RateLimiter::LimitExceeded
|
|
# no idea who this is, but they are limited
|
|
{}
|
|
rescue => e
|
|
Rails.logger.warn(
|
|
"Failed to append custom options: #{e.message}\n#{e.backtrace.join("\n")}",
|
|
)
|
|
{}
|
|
end
|
|
end
|
|
|
|
if ENV["ENABLE_LOGSTASH_LOGGER"] == "1"
|
|
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,
|
|
)
|
|
|
|
# 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
|
|
end
|
|
end
|
|
end
|
|
end
|