[ARVADOS] created: 2.1.0-1415-gdcd77dd78

[Git user]

        at  dcd77dd78f89a225cc9bcefc1930f8a54bc62791 (commit)


commit dcd77dd78f89a225cc9bcefc1930f8a54bc62791
Author: Ward Vandewege <ward at curii.com>
Date:   Tue Sep 28 14:25:42 2021 -0400

    The request_id passing was moved to Rails middleware as part of #17830.
    Unfortunately, in that process the logging of the request_id parameter
    in the rails logs was broken. This commit fixes that.
    
    refs #17830
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/services/api/app/controllers/application_controller.rb b/services/api/app/controllers/application_controller.rb
index ff4cb88ae..3750befb3 100644
--- a/services/api/app/controllers/application_controller.rb
+++ b/services/api/app/controllers/application_controller.rb
@@ -427,7 +427,7 @@ class ApplicationController < ActionController::Base
 
   def append_info_to_payload(payload)
     super
-    payload[:request_id] = response.headers['X-Request-Id']
+    payload[:request_id] = request.request_id
     payload[:client_ipaddr] = @remote_ip
     payload[:client_auth] = current_api_client_authorization.andand.uuid || nil
   end

-----------------------------------------------------------------------


hooks/post-receive
--