[ARVADOS] updated: 1.1.4-143-g7d96319

[Git user]

Summary of changes:
 services/keepproxy/keepproxy.go    | 4 ++--
 services/keepproxy/proxy_client.go | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

       via  7d96319e476c866f33f119dddd534fa6cbe482fb (commit)
      from  97ad08809663d2adcb00947a1dcc0f922f5937bc (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 7d96319e476c866f33f119dddd534fa6cbe482fb
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Tue May 1 11:16:47 2018 -0400

    12167: Pass request ID via keepclient instead of custom code.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/services/keepproxy/keepproxy.go b/services/keepproxy/keepproxy.go
index c2bf6bc..7baadab 100644
--- a/services/keepproxy/keepproxy.go
+++ b/services/keepproxy/keepproxy.go
@@ -622,13 +622,13 @@ func (h *proxyHandler) Index(resp http.ResponseWriter, req *http.Request) {
 
 func (h *proxyHandler) makeKeepClient(req *http.Request) *keepclient.KeepClient {
 	kc := *h.KeepClient
+	kc.RequestID = req.Header.Get("X-Request-Id")
 	kc.HTTPClient = &proxyClient{
 		client: &http.Client{
 			Timeout:   h.timeout,
 			Transport: h.transport,
 		},
-		proto:     req.Proto,
-		requestID: req.Header.Get("X-Request-Id"),
+		proto: req.Proto,
 	}
 	return &kc
 }
diff --git a/services/keepproxy/proxy_client.go b/services/keepproxy/proxy_client.go
index 06dfa1c..0faf4ae 100644
--- a/services/keepproxy/proxy_client.go
+++ b/services/keepproxy/proxy_client.go
@@ -13,13 +13,11 @@ import (
 var viaAlias = "keepproxy"
 
 type proxyClient struct {
-	client    keepclient.HTTPClient
-	proto     string
-	requestID string
+	client keepclient.HTTPClient
+	proto  string
 }
 
 func (pc *proxyClient) Do(req *http.Request) (*http.Response, error) {
 	req.Header.Add("Via", pc.proto+" "+viaAlias)
-	req.Header.Set("X-Request-Id", pc.requestID)
 	return pc.client.Do(req)
 }

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


hooks/post-receive
--