[ARVADOS] updated: 1.1.4-775-g63def826c

Git user git at public.curoverse.com
Thu Aug 9 15:28:54 EDT 2018


Summary of changes:
 services/api/app/controllers/application_controller.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

       via  63def826c674fe3d277bff61084e6da22688e951 (commit)
       via  39c17737ac69d7693684fe2f95bef0ec235a28bf (commit)
       via  810f2d8a0e6720568a963462e538daa5c692ace3 (commit)
      from  2a298d6cca655c16847733c5ddfc3cc02e71ff8c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 63def826c674fe3d277bff61084e6da22688e951
Merge: 2a298d6cc 39c17737a
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Thu Aug 9 15:27:57 2018 -0400

    Merge branch 'wtsi-hgi-13558-debug-log-tag-req-id'
    
    closes #13558
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>


commit 39c17737ac69d7693684fe2f95bef0ec235a28bf
Merge: 810f2d8a0 2a298d6cc
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Thu Aug 9 15:06:28 2018 -0400

    13558: Merge branch 'master' into wtsi-hgi-13558-debug-log-tag-req-id
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>


commit 810f2d8a0e6720568a963462e538daa5c692ace3
Author: Joshua C. Randall <jcrandall at alum.mit.edu>
Date:   Fri Jun 1 18:53:29 2018 +0000

    13558: add req_id as a tag to Rails.logger
    
    closes #13558
    
    Arvados-DCO-1.1-Signed-off-by: Joshua C. Randall <jcrandall at alum.mit.edu>

diff --git a/services/api/app/controllers/application_controller.rb b/services/api/app/controllers/application_controller.rb
index ba7c07d27..71176056f 100644
--- a/services/api/app/controllers/application_controller.rb
+++ b/services/api/app/controllers/application_controller.rb
@@ -382,7 +382,9 @@ class ApplicationController < ActionController::Base
       req_id = "req-" + Random::DEFAULT.rand(2**128).to_s(36)[0..19]
     end
     response.headers['X-Request-Id'] = Thread.current[:request_id] = req_id
-    yield
+    Rails.logger.tagged(req_id) do
+      yield
+    end
     Thread.current[:request_id] = nil
   end
 

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list