diff options
| author | Andrew Newdigate <andrew@gitlab.com> | 2018-02-28 12:04:08 +0000 |
|---|---|---|
| committer | Andrew Newdigate <andrew@gitlab.com> | 2018-02-28 12:04:08 +0000 |
| commit | c869aa917c20b8289b3074431ec986c30b0b3834 (patch) | |
| tree | c54c99885c7c181be44f908f176e629e35bd05de | |
| parent | 0be4a77d0012613f960c4177f53101c46de2899c (diff) | |
| download | gitlab-ce-c869aa917c20b8289b3074431ec986c30b0b3834.tar.gz | |
Fix for open-ended parameter's in lograge causing elastic memory issues.
See https://gitlab.com/gitlab-com/infrastructure/issues/2888
See https://gitlab.com/gitlab-org/gitlab-ce/issues/43678
See https://gitlab.com/gitlab-com/migration/issues/163
| -rw-r--r-- | config/initializers/lograge.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/config/initializers/lograge.rb b/config/initializers/lograge.rb index 8560d24526f..f78f530e9a8 100644 --- a/config/initializers/lograge.rb +++ b/config/initializers/lograge.rb @@ -12,9 +12,12 @@ 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)) + .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] |