Merge branch '14287-controller-structure'

[arvados.git] / lib / service / cmd.go

diff --git a/lib/service/cmd.go b/lib/service/cmd.go
index 94021163e469fd87c6eb58dc29041ba00b95b65a..603f48890eccb6686a77ff8f80e99a8d020bfd52 100644 (file)
--- a/lib/service/cmd.go
+++ b/lib/service/cmd.go
@@ -116,7 +116,8 @@ func (c *command) RunCommand(prog string, args []string, stdin io.Reader, stdout
        }
        srv := &httpserver.Server{
                Server: http.Server{
-                       Handler: httpserver.AddRequestIDs(httpserver.LogRequests(log, handler)),
+                       Handler: httpserver.HandlerWithContext(ctx,
+                               httpserver.AddRequestIDs(httpserver.LogRequests(handler))),
                },
                Addr: listen,
        }