X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0fb04af57862494beb38f57b75a1427ee9443e25..b39f7a6141ecd5c53531b7705c0496623b4df9e9:/services/keep-web/server.go diff --git a/services/keep-web/server.go b/services/keep-web/server.go index b81c251753..8f623c627d 100644 --- a/services/keep-web/server.go +++ b/services/keep-web/server.go @@ -8,9 +8,9 @@ import ( "context" "net/http" - "git.curoverse.com/arvados.git/sdk/go/arvados" - "git.curoverse.com/arvados.git/sdk/go/ctxlog" - "git.curoverse.com/arvados.git/sdk/go/httpserver" + "git.arvados.org/arvados.git/sdk/go/arvados" + "git.arvados.org/arvados.git/sdk/go/ctxlog" + "git.arvados.org/arvados.git/sdk/go/httpserver" "github.com/prometheus/client_golang/prometheus" "github.com/sirupsen/logrus" ) @@ -20,12 +20,12 @@ type server struct { Config *Config } -func (srv *server) Start() error { +func (srv *server) Start(logger *logrus.Logger) error { h := &handler{Config: srv.Config} reg := prometheus.NewRegistry() h.Config.Cache.registry = reg - ctx := ctxlog.Context(context.Background(), logrus.StandardLogger()) - mh := httpserver.Instrument(reg, nil, httpserver.HandlerWithContext(ctx, httpserver.AddRequestIDs(httpserver.LogRequests(h)))) + ctx := ctxlog.Context(context.Background(), logger) + mh := httpserver.Instrument(reg, logger, httpserver.HandlerWithContext(ctx, httpserver.AddRequestIDs(httpserver.LogRequests(h)))) h.MetricsAPI = mh.ServeAPI(h.Config.cluster.ManagementToken, http.NotFoundHandler()) srv.Handler = mh var listen arvados.URL