mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
Improve lograge custom payload error handling.
This commit is contained in:
parent
b014540fde
commit
7d8cd84fa6
@ -10,9 +10,23 @@ if (Rails.env.production? && SiteSetting.logging_provider == 'lograge') || ENV["
|
|||||||
|
|
||||||
config.lograge.custom_payload do |controller|
|
config.lograge.custom_payload do |controller|
|
||||||
begin
|
begin
|
||||||
|
username =
|
||||||
|
begin
|
||||||
|
controller.current_user&.username
|
||||||
|
rescue Discourse::InvalidAccess
|
||||||
|
nil
|
||||||
|
end
|
||||||
|
|
||||||
|
ip =
|
||||||
|
begin
|
||||||
|
controller.request.remote_ip
|
||||||
|
rescue ActionDispatch::RemoteIp::IpSpoofAttackError
|
||||||
|
nil
|
||||||
|
end
|
||||||
|
|
||||||
{
|
{
|
||||||
ip: controller.request.remote_ip,
|
ip: ip,
|
||||||
username: controller.current_user&.username,
|
username: username,
|
||||||
}
|
}
|
||||||
rescue => e
|
rescue => e
|
||||||
Rails.logger.warn("Failed to append custom payload: #{e.message}\n#{e.backtrace.join("\n")}")
|
Rails.logger.warn("Failed to append custom payload: #{e.message}\n#{e.backtrace.join("\n")}")
|
||||||
|
Loading…
Reference in New Issue
Block a user