X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/08d0b1ab43499b7f13462d5e3555d239b4634d22..924f8f6c13c06afc8a83168929b249e0e8fa7d18:/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 +}()