projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
14324: Use logrus in Azure driver. Fix Sirupsen->sirupsen in imports
[arvados.git]
/
services
/
keepstore
/
handlers.go
diff --git
a/services/keepstore/handlers.go
b/services/keepstore/handlers.go
index 2426c9cbdacd4044a4c2fab06f4ee51edef2b4e9..e079b96784a16b985ed6ce47f99655e39a571ce9 100644
(file)
--- a/
services/keepstore/handlers.go
+++ b/
services/keepstore/handlers.go
@@
-87,9
+87,9
@@
func MakeRESTRouter(cluster *arvados.Cluster) http.Handler {
rtr.limiter = httpserver.NewRequestLimiter(theConfig.MaxRequests, rtr)
rtr.limiter = httpserver.NewRequestLimiter(theConfig.MaxRequests, rtr)
-
stack
:= httpserver.Instrument(nil, nil,
+
instrumented
:= httpserver.Instrument(nil, nil,
httpserver.AddRequestIDs(httpserver.LogRequests(nil, rtr.limiter)))
httpserver.AddRequestIDs(httpserver.LogRequests(nil, rtr.limiter)))
- return
stack.ServeAPI(stack
)
+ return
instrumented.ServeAPI(theConfig.ManagementToken, instrumented
)
}
// BadRequestHandler is a HandleFunc to address bad requests.
}
// BadRequestHandler is a HandleFunc to address bad requests.
@@
-103,7
+103,7
@@
func (rtr *router) handleGET(resp http.ResponseWriter, req *http.Request) {
locator := req.URL.Path[1:]
if strings.Contains(locator, "+R") && !strings.Contains(locator, "+A") {
locator := req.URL.Path[1:]
if strings.Contains(locator, "+R") && !strings.Contains(locator, "+A") {
- rtr.remoteProxy.Get(resp, req, rtr.cluster)
+ rtr.remoteProxy.Get(
ctx,
resp, req, rtr.cluster)
return
}
return
}