From 09cee4c3159ce8b2595f2217e880eee45477b54a Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Thu, 2 Nov 2017 14:40:18 +0800
Subject: [PATCH] Don't add time to logs when using logstash formatter.

---
 config/initializers/100-lograge.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/config/initializers/100-lograge.rb b/config/initializers/100-lograge.rb
index 304fde3ced4..f7d199a9e87 100644
--- a/config/initializers/100-lograge.rb
+++ b/config/initializers/100-lograge.rb
@@ -4,6 +4,8 @@ if (Rails.env.production? && SiteSetting.logging_provider == 'lograge') || ENV["
   Rails.application.configure do
     config.lograge.enabled = true
 
+    logstash_formatter = ENV["LOGSTASH_FORMATTER"]
+
     config.lograge.custom_options = lambda do |event|
       exceptions = %w(controller action format id)
 
@@ -13,11 +15,13 @@ if (Rails.env.production? && SiteSetting.logging_provider == 'lograge') || ENV["
       output = {
         params: params,
         database: RailsMultisite::ConnectionManagement.current_db,
-        time: event.time,
       }
+
+      output[:time] = event.time unless logstash_formatter
+      output
     end
 
-    if ENV["LOGSTASH_FORMATTER"]
+    if logstash_formatter
       config.lograge.formatter = Lograge::Formatters::Logstash.new
     end
   end