From 1b9a38c5e2fd9105f8b77a0625bcecec9a825c27 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Tue, 17 Apr 2018 12:07:13 +0800 Subject: [PATCH] FIX: Incorrect formatter used when logstash formatter is enabled. --- config/initializers/{100-lograge.rb => 101-lograge.rb} | 4 +--- lib/discourse_logstash_logger.rb | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) rename config/initializers/{100-lograge.rb => 101-lograge.rb} (96%) diff --git a/config/initializers/100-lograge.rb b/config/initializers/101-lograge.rb similarity index 96% rename from config/initializers/100-lograge.rb rename to config/initializers/101-lograge.rb index 7b4b5e4e46c..650a046039d 100644 --- a/config/initializers/100-lograge.rb +++ b/config/initializers/101-lograge.rb @@ -33,9 +33,7 @@ if (Rails.env.production? && SiteSetting.logging_provider == 'lograge') || ENV[" { ip: ip, - username: username, - hostname: `hostname`, - pid: Process.pid + username: username } rescue => e Rails.logger.warn("Failed to append custom payload: #{e.message}\n#{e.backtrace.join("\n")}") diff --git a/lib/discourse_logstash_logger.rb b/lib/discourse_logstash_logger.rb index 369e7e3c052..32376b49600 100644 --- a/lib/discourse_logstash_logger.rb +++ b/lib/discourse_logstash_logger.rb @@ -10,6 +10,7 @@ class DiscourseLogstashLogger event['severity_name'] = event['severity'] event['severity'] = Object.const_get("Logger::Severity::#{event['severity']}") event['type'] = type + event['pid'] = Process.pid }, ) end