From d00802fa1ed1729e8ef0a485e62a5ef9ac84e990 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Wed, 28 Feb 2018 15:45:42 +0000 Subject: Merge branch 'an/lograge-fix' into 'master' Fix for open-ended parameter's in lograge causing elastic memory issues See merge request gitlab-org/gitlab-ce!17419 --- config/initializers/lograge.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/config/initializers/lograge.rb b/config/initializers/lograge.rb index 8560d24526f..114c1cb512f 100644 --- a/config/initializers/lograge.rb +++ b/config/initializers/lograge.rb @@ -12,9 +12,14 @@ unless Sidekiq.server? config.lograge.logger = ActiveSupport::Logger.new(filename) # Add request parameters to log output config.lograge.custom_options = lambda do |event| + params = event.payload[:params] + .except(*%w(controller action format)) + .each_pair + .map { |k, v| { key: k, value: v } } + payload = { time: event.time.utc.iso8601(3), - params: event.payload[:params].except(*%w(controller action format)), + params: params, remote_ip: event.payload[:remote_ip], user_id: event.payload[:user_id], username: event.payload[:username] -- cgit v1.2.1