Merge branch '8784-dir-listings'

[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 24252c8aa7c928ef117fe24ffd0f4011cddeca0e..321bd037f98d58fd0fe9c860fc0c3f40ab771bc8 100644 (file)
--- a/apps/workbench/config/initializers/lograge.rb
+++ b/apps/workbench/config/initializers/lograge.rb
@@ -1,10 +1,16 @@
+# 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|
     exceptions = %w(controller action format id)
-    params = event.payload[:params].except(*exceptions)
+    params = {current_request_id: Thread.current[:current_request_id]}.
+             merge(event.payload[:params].except(*exceptions))
     params_s = Oj.dump(params)
+    Thread.current[:current_request_id] = nil # Clear for next request
     if params_s.length > 1000
       { params_truncated: params_s[0..1000] + "[...]" }
     else