projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
16470: Fixes deprecation warning.
[arvados.git]
/
apps
/
workbench
/
config
/
initializers
/
lograge.rb
diff --git
a/apps/workbench/config/initializers/lograge.rb
b/apps/workbench/config/initializers/lograge.rb
index fa19667e3693848415f257223e13262fd99175c7..6e7f165c135b2132bcaef1e89ccac6890f585ed4 100644
(file)
--- a/
apps/workbench/config/initializers/lograge.rb
+++ b/
apps/workbench/config/initializers/lograge.rb
@@
-1,16
+1,25
@@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
ArvadosWorkbench::Application.configure do
config.lograge.enabled = true
config.lograge.formatter = Lograge::Formatters::Logstash.new
config.lograge.custom_options = lambda do |event|
ArvadosWorkbench::Application.configure do
config.lograge.enabled = true
config.lograge.formatter = Lograge::Formatters::Logstash.new
config.lograge.custom_options = lambda do |event|
+ payload = {
+ request_id: event.payload[:request_id],
+ }
+ # Also log params (minus the pseudo-params added by Rails). But if
+ # params is huge, don't log the whole thing, just hope we get the
+ # most useful bits in truncate(json(params)).
exceptions = %w(controller action format id)
exceptions = %w(controller action format id)
- params = {current_request_id: Thread.current[:current_request_id]}.
- merge(event.payload[:params].except(*exceptions))
+ params = event.payload[:params].except(*exceptions)
params_s = Oj.dump(params)
params_s = Oj.dump(params)
- Thread.current[:current_request_id] = nil # Clear for next request
if params_s.length > 1000
if params_s.length > 1000
- { params_truncated: params_s[0..1000] + "[...]" }
+ payload[:params_truncated] = params_s[0..1000] + "[...]"
else
else
- { params: params }
+ payload[:params] = params
end
end
+ payload
end
end
end
end