X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/004cf8a6b59ac10bf84e213309289e6138c48b7d..18d976b4701d76bdeb05e0fe3c1757060d3b8a2a:/lib/service/error.go diff --git a/lib/service/error.go b/lib/service/error.go index 8955210913..a4d7370d1b 100644 --- a/lib/service/error.go +++ b/lib/service/error.go @@ -8,8 +8,8 @@ import ( "context" "net/http" - "git.curoverse.com/arvados.git/sdk/go/arvados" - "git.curoverse.com/arvados.git/sdk/go/ctxlog" + "git.arvados.org/arvados.git/sdk/go/arvados" + "git.arvados.org/arvados.git/sdk/go/ctxlog" "github.com/sirupsen/logrus" ) @@ -17,7 +17,7 @@ import ( // responds 500 to all requests. ErrorHandler itself logs the given // error once, and the handler logs it again for each incoming // request. -func ErrorHandler(ctx context.Context, _ *arvados.Cluster, _ *arvados.NodeProfile, err error) Handler { +func ErrorHandler(ctx context.Context, _ *arvados.Cluster, err error) Handler { logger := ctxlog.FromContext(ctx) logger.WithError(err).Error("unhealthy service") return errorHandler{err, logger} @@ -36,3 +36,15 @@ func (eh errorHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { func (eh errorHandler) CheckHealth() error { return eh.err } + +// Done returns a closed channel to indicate the service has +// stopped/failed. +func (eh errorHandler) Done() <-chan struct{} { + return doneChannel +} + +var doneChannel = func() <-chan struct{} { + done := make(chan struct{}) + close(done) + return done +}()