Merge branch '9001-summary-skip-malformed-lines' closes #9001

[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..fa19667e3693848415f257223e13262fd99175c7 100644 (file)
--- a/apps/workbench/config/initializers/lograge.rb
+++ b/apps/workbench/config/initializers/lograge.rb
@@ -3,8 +3,10 @@ ArvadosWorkbench::Application.configure do
   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