From 0437722353436e4a6f752286ff7da0715207e2d3 Mon Sep 17 00:00:00 2001 From: Florian Schade Date: Thu, 17 Oct 2024 13:43:42 +0200 Subject: [PATCH] Bugfix: Fix health and ready endpoint checker configurations --- .../fix-health-and-ready-endpoints.md | 15 +++++++ ocis-pkg/handlers/checker.go | 20 +--------- ocis-pkg/handlers/checker_test.go | 18 ++++----- ocis-pkg/service/debug/service.go | 25 ++++++++---- .../activitylog/pkg/server/debug/server.go | 20 ++++------ services/antivirus/pkg/server/debug/server.go | 39 ++++++++----------- .../app-provider/pkg/server/debug/server.go | 8 ---- .../app-registry/pkg/server/debug/server.go | 8 ---- services/audit/pkg/server/debug/server.go | 17 ++------ services/auth-app/pkg/server/debug/server.go | 8 ---- .../auth-basic/pkg/server/debug/server.go | 8 ---- .../auth-bearer/pkg/server/debug/server.go | 8 ---- .../auth-machine/pkg/server/debug/server.go | 8 ---- .../auth-service/pkg/server/debug/server.go | 8 ---- services/clientlog/pkg/server/debug/server.go | 17 ++------ .../collaboration/pkg/server/debug/server.go | 8 ---- .../eventhistory/pkg/server/debug/server.go | 20 ++++------ services/frontend/pkg/server/debug/server.go | 8 ---- services/gateway/pkg/server/debug/server.go | 8 ---- services/groups/pkg/server/debug/server.go | 8 ---- services/idm/pkg/server/debug/server.go | 8 ---- services/idp/pkg/server/debug/server.go | 20 ++++------ .../notifications/pkg/server/debug/server.go | 19 +++------ services/ocdav/pkg/server/debug/server.go | 8 ---- services/ocm/pkg/server/debug/server.go | 8 ---- services/policies/pkg/server/debug/server.go | 8 ---- .../postprocessing/pkg/server/debug/server.go | 8 ---- services/search/pkg/server/debug/server.go | 32 +++++++-------- services/sharing/pkg/server/debug/server.go | 8 ---- services/sse/pkg/server/debug/server.go | 20 ++++------ .../pkg/server/debug/server.go | 8 ---- .../storage-shares/pkg/server/debug/server.go | 8 ---- .../storage-system/pkg/server/debug/server.go | 8 ---- .../storage-users/pkg/server/debug/server.go | 8 ---- services/userlog/pkg/server/debug/server.go | 20 ++++------ services/users/pkg/server/debug/server.go | 8 ---- 36 files changed, 121 insertions(+), 357 deletions(-) create mode 100644 changelog/unreleased/fix-health-and-ready-endpoints.md diff --git a/changelog/unreleased/fix-health-and-ready-endpoints.md b/changelog/unreleased/fix-health-and-ready-endpoints.md new file mode 100644 index 0000000000..6de5134dfd --- /dev/null +++ b/changelog/unreleased/fix-health-and-ready-endpoints.md @@ -0,0 +1,15 @@ +Bugfix: Fix health and ready endpoints + +We added new checks to the `/readyz` and `/healthz` endpoints to ensure that the services are ready and healthy. +This change ensures that the endpoints return the correct status codes, which is needed to stabilize the k8s deployments. + +https://github.com/owncloud/ocis/pull/10163 +https://github.com/owncloud/ocis/pull/10301 +https://github.com/owncloud/ocis/pull/10302 +https://github.com/owncloud/ocis/pull/10303 +https://github.com/owncloud/ocis/pull/10308 +https://github.com/owncloud/ocis/pull/10323 +https://github.com/owncloud/ocis/pull/10163 +https://github.com/owncloud/ocis/pull/10333 +https://github.com/owncloud/ocis/issues/10316 +https://github.com/owncloud/ocis/issues/10281 diff --git a/ocis-pkg/handlers/checker.go b/ocis-pkg/handlers/checker.go index 76e1399faf..48ee3b12b1 100644 --- a/ocis-pkg/handlers/checker.go +++ b/ocis-pkg/handlers/checker.go @@ -15,12 +15,9 @@ import ( // check is a function that performs a check. type checker func(ctx context.Context) error -// checks is a map of check names to check functions. -type checkers map[string]func(ctx context.Context) error - // CheckHandlerConfiguration defines the configuration for the CheckHandler. type CheckHandlerConfiguration struct { - checks checkers + checks map[string]checker logger log.Logger limit int statusFailed int @@ -30,7 +27,7 @@ type CheckHandlerConfiguration struct { // NewCheckHandlerConfiguration initializes a new CheckHandlerConfiguration. func NewCheckHandlerConfiguration() CheckHandlerConfiguration { return CheckHandlerConfiguration{ - checks: make(checkers), + checks: make(map[string]checker), limit: -1, statusFailed: http.StatusInternalServerError, @@ -56,15 +53,6 @@ func (c CheckHandlerConfiguration) WithCheck(name string, check checker) CheckHa return c } -// WithChecks adds multiple checks to the CheckHandlerConfiguration. -func (c CheckHandlerConfiguration) WithChecks(checks checkers) CheckHandlerConfiguration { - for name, check := range checks { - c.checks = c.WithCheck(name, check).checks - } - - return c -} - // WithLimit limits the number of active goroutines for the checks to at most n func (c CheckHandlerConfiguration) WithLimit(n int) CheckHandlerConfiguration { c.limit = n @@ -96,10 +84,6 @@ func NewCheckHandler(c CheckHandlerConfiguration) *CheckHandler { } } -func (h *CheckHandler) Checks() map[string]func(ctx context.Context) error { - return maps.Clone(h.conf.checks) -} - func (h *CheckHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { g, ctx := errgroup.WithContext(r.Context()) g.SetLimit(h.conf.limit) diff --git a/ocis-pkg/handlers/checker_test.go b/ocis-pkg/handlers/checker_test.go index 794486a293..3a87111b6f 100644 --- a/ocis-pkg/handlers/checker_test.go +++ b/ocis-pkg/handlers/checker_test.go @@ -17,19 +17,18 @@ import ( ) func TestCheckHandlerConfiguration(t *testing.T) { - nopCheck := func(_ context.Context) error { return nil } + nopCheckCounter := 0 + nopCheck := func(_ context.Context) error { nopCheckCounter++; return nil } handlerConfiguration := handlers.NewCheckHandlerConfiguration().WithCheck("check-1", nopCheck) t.Run("add check", func(t *testing.T) { - inheritedHandlerConfiguration := handlerConfiguration.WithCheck("check-2", nopCheck) - require.Equal(t, 1, len(handlers.NewCheckHandler(handlerConfiguration).Checks())) - require.Equal(t, 2, len(handlers.NewCheckHandler(inheritedHandlerConfiguration).Checks())) - }) + localCounter := 0 + handlers.NewCheckHandler(handlerConfiguration).ServeHTTP(httptest.NewRecorder(), httptest.NewRequest("GET", "/", nil)) + require.Equal(t, 1, nopCheckCounter) - t.Run("add checks", func(t *testing.T) { - inheritedHandlerConfiguration := handlerConfiguration.WithChecks(map[string]func(ctx context.Context) error{"check-2": nopCheck, "check-3": nopCheck}) - require.Equal(t, 1, len(handlers.NewCheckHandler(handlerConfiguration).Checks())) - require.Equal(t, 3, len(handlers.NewCheckHandler(inheritedHandlerConfiguration).Checks())) + handlers.NewCheckHandler(handlerConfiguration.WithCheck("check-2", func(_ context.Context) error { localCounter++; return nil })).ServeHTTP(httptest.NewRecorder(), httptest.NewRequest("GET", "/", nil)) + require.Equal(t, 2, nopCheckCounter) + require.Equal(t, 1, localCounter) }) t.Run("checks are unique", func(t *testing.T) { @@ -40,6 +39,7 @@ func TestCheckHandlerConfiguration(t *testing.T) { }() handlerConfiguration.WithCheck("check-1", nopCheck) + require.Equal(t, 3, nopCheckCounter) }) } diff --git a/ocis-pkg/service/debug/service.go b/ocis-pkg/service/debug/service.go index 82e056ea7d..df16ced77d 100644 --- a/ocis-pkg/service/debug/service.go +++ b/ocis-pkg/service/debug/service.go @@ -12,10 +12,26 @@ import ( "go.opentelemetry.io/contrib/zpages" "github.com/owncloud/ocis/v2/ocis-pkg/cors" + "github.com/owncloud/ocis/v2/ocis-pkg/handlers" + "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/owncloud/ocis/v2/ocis-pkg/middleware" graphMiddleware "github.com/owncloud/ocis/v2/services/graph/pkg/middleware" ) +var handleProbe = func(mux *http.ServeMux, pattern string, h http.Handler, name string, logger log.Logger) { + if h == nil { + h = handlers.NewCheckHandler(handlers.NewCheckHandlerConfiguration()) + logger.Info(). + Str("service", name). + Str("endpoint", pattern). + Msg("no probe provided, reverting to default (OK)") + } + + mux.Handle(pattern, h) +} + +//var probeHandler = func(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusOK) } + // NewService initializes a new debug service. func NewService(opts ...Option) *http.Server { dopts := newOptions(opts...) @@ -29,13 +45,8 @@ func NewService(opts ...Option) *http.Server { promhttp.Handler(), )) - if dopts.Health != nil { - mux.Handle("/healthz", dopts.Health) - } - - if dopts.Ready != nil { - mux.Handle("/readyz", dopts.Ready) - } + handleProbe(mux, "/healthz", dopts.Health, dopts.Name, dopts.Logger) // healthiness check + handleProbe(mux, "/readyz", dopts.Ready, dopts.Name, dopts.Logger) // readiness check if dopts.ConfigDump != nil { mux.Handle("/config", dopts.ConfigDump) diff --git a/services/activitylog/pkg/server/debug/server.go b/services/activitylog/pkg/server/debug/server.go index 60c1c697e1..f2c235c778 100644 --- a/services/activitylog/pkg/server/debug/server.go +++ b/services/activitylog/pkg/server/debug/server.go @@ -13,18 +13,12 @@ import ( func Server(opts ...Option) (*http.Server, error) { options := newOptions(opts...) - healthHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger). - WithCheck("http reachability", checks.NewHTTPCheck(options.Config.HTTP.Addr)), - ) + healthHandlerConfiguration := handlers.NewCheckHandlerConfiguration(). + WithLogger(options.Logger). + WithCheck("http reachability", checks.NewHTTPCheck(options.Config.HTTP.Addr)) - readyHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger). - WithCheck("nats reachability", checks.NewNatsCheck(options.Config.Events.Cluster)). - WithChecks(healthHandler.Checks()), - ) + readyHandlerConfiguration := healthHandlerConfiguration. + WithCheck("nats reachability", checks.NewNatsCheck(options.Config.Events.Cluster)) return debug.NewService( debug.Logger(options.Logger), @@ -34,7 +28,7 @@ func Server(opts ...Option) (*http.Server, error) { debug.Token(options.Config.Debug.Token), debug.Pprof(options.Config.Debug.Pprof), debug.Zpages(options.Config.Debug.Zpages), - debug.Health(healthHandler), - debug.Ready(readyHandler), + debug.Health(handlers.NewCheckHandler(healthHandlerConfiguration)), + debug.Ready(handlers.NewCheckHandler(readyHandlerConfiguration)), ), nil } diff --git a/services/antivirus/pkg/server/debug/server.go b/services/antivirus/pkg/server/debug/server.go index 60f69cd06e..5fbc2c5ccd 100644 --- a/services/antivirus/pkg/server/debug/server.go +++ b/services/antivirus/pkg/server/debug/server.go @@ -17,27 +17,21 @@ import ( func Server(opts ...Option) (*http.Server, error) { options := newOptions(opts...) - healthHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger), - ) - - readyHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger). - WithCheck("nats reachability", checks.NewNatsCheck(options.Config.Events.Cluster)). - WithCheck("antivirus reachability", func(ctx context.Context) error { - cfg := options.Config - switch cfg.Scanner.Type { - default: - return errors.New("no antivirus configured") - case "clamav": - return clamd.NewClamd(cfg.Scanner.ClamAV.Socket).Ping() - case "icap": - return checks.NewTCPCheck(cfg.Scanner.ICAP.URL)(ctx) - } - }), - ) + readyHandlerConfiguration := handlers.NewCheckHandlerConfiguration(). + WithLogger(options.Logger). + WithLogger(options.Logger). + WithCheck("nats reachability", checks.NewNatsCheck(options.Config.Events.Cluster)). + WithCheck("antivirus reachability", func(ctx context.Context) error { + cfg := options.Config + switch cfg.Scanner.Type { + default: + return errors.New("no antivirus configured") + case "clamav": + return clamd.NewClamd(cfg.Scanner.ClamAV.Socket).Ping() + case "icap": + return checks.NewTCPCheck(cfg.Scanner.ICAP.URL)(ctx) + } + }) return debug.NewService( debug.Logger(options.Logger), @@ -47,7 +41,6 @@ func Server(opts ...Option) (*http.Server, error) { debug.Token(options.Config.Debug.Token), debug.Pprof(options.Config.Debug.Pprof), debug.Zpages(options.Config.Debug.Zpages), - debug.Health(healthHandler), - debug.Ready(readyHandler), + debug.Ready(handlers.NewCheckHandler(readyHandlerConfiguration)), ), nil } diff --git a/services/app-provider/pkg/server/debug/server.go b/services/app-provider/pkg/server/debug/server.go index 46264bd66b..3ce3b8d3c9 100644 --- a/services/app-provider/pkg/server/debug/server.go +++ b/services/app-provider/pkg/server/debug/server.go @@ -3,7 +3,6 @@ package debug import ( "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" "github.com/owncloud/ocis/v2/ocis-pkg/version" ) @@ -12,11 +11,6 @@ import ( func Server(opts ...Option) (*http.Server, error) { options := newOptions(opts...) - checkHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger), - ) - return debug.NewService( debug.Logger(options.Logger), debug.Name(options.Config.Service.Name), @@ -25,8 +19,6 @@ func Server(opts ...Option) (*http.Server, error) { debug.Token(options.Config.Debug.Token), debug.Pprof(options.Config.Debug.Pprof), debug.Zpages(options.Config.Debug.Zpages), - debug.Health(checkHandler), - debug.Ready(checkHandler), //debug.CorsAllowedOrigins(options.Config.HTTP.CORS.AllowedOrigins), //debug.CorsAllowedMethods(options.Config.HTTP.CORS.AllowedMethods), //debug.CorsAllowedHeaders(options.Config.HTTP.CORS.AllowedHeaders), diff --git a/services/app-registry/pkg/server/debug/server.go b/services/app-registry/pkg/server/debug/server.go index 46264bd66b..3ce3b8d3c9 100644 --- a/services/app-registry/pkg/server/debug/server.go +++ b/services/app-registry/pkg/server/debug/server.go @@ -3,7 +3,6 @@ package debug import ( "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" "github.com/owncloud/ocis/v2/ocis-pkg/version" ) @@ -12,11 +11,6 @@ import ( func Server(opts ...Option) (*http.Server, error) { options := newOptions(opts...) - checkHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger), - ) - return debug.NewService( debug.Logger(options.Logger), debug.Name(options.Config.Service.Name), @@ -25,8 +19,6 @@ func Server(opts ...Option) (*http.Server, error) { debug.Token(options.Config.Debug.Token), debug.Pprof(options.Config.Debug.Pprof), debug.Zpages(options.Config.Debug.Zpages), - debug.Health(checkHandler), - debug.Ready(checkHandler), //debug.CorsAllowedOrigins(options.Config.HTTP.CORS.AllowedOrigins), //debug.CorsAllowedMethods(options.Config.HTTP.CORS.AllowedMethods), //debug.CorsAllowedHeaders(options.Config.HTTP.CORS.AllowedHeaders), diff --git a/services/audit/pkg/server/debug/server.go b/services/audit/pkg/server/debug/server.go index c00ee35b2c..4ca2a6c8fc 100644 --- a/services/audit/pkg/server/debug/server.go +++ b/services/audit/pkg/server/debug/server.go @@ -13,17 +13,9 @@ import ( func Server(opts ...Option) (*http.Server, error) { options := newOptions(opts...) - checkHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger), - ) - - readyHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger). - WithCheck("nats reachability", checks.NewNatsCheck(options.Config.Events.Cluster)). - WithChecks(checkHandler.Checks()), - ) + readyHandlerConfiguration := handlers.NewCheckHandlerConfiguration(). + WithLogger(options.Logger). + WithCheck("nats reachability", checks.NewNatsCheck(options.Config.Events.Cluster)) return debug.NewService( debug.Logger(options.Logger), @@ -33,7 +25,6 @@ func Server(opts ...Option) (*http.Server, error) { debug.Token(options.Config.Debug.Token), debug.Pprof(options.Config.Debug.Pprof), debug.Zpages(options.Config.Debug.Zpages), - debug.Health(checkHandler), - debug.Ready(readyHandler), + debug.Ready(handlers.NewCheckHandler(readyHandlerConfiguration)), ), nil } diff --git a/services/auth-app/pkg/server/debug/server.go b/services/auth-app/pkg/server/debug/server.go index 46264bd66b..3ce3b8d3c9 100644 --- a/services/auth-app/pkg/server/debug/server.go +++ b/services/auth-app/pkg/server/debug/server.go @@ -3,7 +3,6 @@ package debug import ( "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" "github.com/owncloud/ocis/v2/ocis-pkg/version" ) @@ -12,11 +11,6 @@ import ( func Server(opts ...Option) (*http.Server, error) { options := newOptions(opts...) - checkHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger), - ) - return debug.NewService( debug.Logger(options.Logger), debug.Name(options.Config.Service.Name), @@ -25,8 +19,6 @@ func Server(opts ...Option) (*http.Server, error) { debug.Token(options.Config.Debug.Token), debug.Pprof(options.Config.Debug.Pprof), debug.Zpages(options.Config.Debug.Zpages), - debug.Health(checkHandler), - debug.Ready(checkHandler), //debug.CorsAllowedOrigins(options.Config.HTTP.CORS.AllowedOrigins), //debug.CorsAllowedMethods(options.Config.HTTP.CORS.AllowedMethods), //debug.CorsAllowedHeaders(options.Config.HTTP.CORS.AllowedHeaders), diff --git a/services/auth-basic/pkg/server/debug/server.go b/services/auth-basic/pkg/server/debug/server.go index 46264bd66b..3ce3b8d3c9 100644 --- a/services/auth-basic/pkg/server/debug/server.go +++ b/services/auth-basic/pkg/server/debug/server.go @@ -3,7 +3,6 @@ package debug import ( "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" "github.com/owncloud/ocis/v2/ocis-pkg/version" ) @@ -12,11 +11,6 @@ import ( func Server(opts ...Option) (*http.Server, error) { options := newOptions(opts...) - checkHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger), - ) - return debug.NewService( debug.Logger(options.Logger), debug.Name(options.Config.Service.Name), @@ -25,8 +19,6 @@ func Server(opts ...Option) (*http.Server, error) { debug.Token(options.Config.Debug.Token), debug.Pprof(options.Config.Debug.Pprof), debug.Zpages(options.Config.Debug.Zpages), - debug.Health(checkHandler), - debug.Ready(checkHandler), //debug.CorsAllowedOrigins(options.Config.HTTP.CORS.AllowedOrigins), //debug.CorsAllowedMethods(options.Config.HTTP.CORS.AllowedMethods), //debug.CorsAllowedHeaders(options.Config.HTTP.CORS.AllowedHeaders), diff --git a/services/auth-bearer/pkg/server/debug/server.go b/services/auth-bearer/pkg/server/debug/server.go index 46264bd66b..3ce3b8d3c9 100644 --- a/services/auth-bearer/pkg/server/debug/server.go +++ b/services/auth-bearer/pkg/server/debug/server.go @@ -3,7 +3,6 @@ package debug import ( "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" "github.com/owncloud/ocis/v2/ocis-pkg/version" ) @@ -12,11 +11,6 @@ import ( func Server(opts ...Option) (*http.Server, error) { options := newOptions(opts...) - checkHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger), - ) - return debug.NewService( debug.Logger(options.Logger), debug.Name(options.Config.Service.Name), @@ -25,8 +19,6 @@ func Server(opts ...Option) (*http.Server, error) { debug.Token(options.Config.Debug.Token), debug.Pprof(options.Config.Debug.Pprof), debug.Zpages(options.Config.Debug.Zpages), - debug.Health(checkHandler), - debug.Ready(checkHandler), //debug.CorsAllowedOrigins(options.Config.HTTP.CORS.AllowedOrigins), //debug.CorsAllowedMethods(options.Config.HTTP.CORS.AllowedMethods), //debug.CorsAllowedHeaders(options.Config.HTTP.CORS.AllowedHeaders), diff --git a/services/auth-machine/pkg/server/debug/server.go b/services/auth-machine/pkg/server/debug/server.go index 46264bd66b..3ce3b8d3c9 100644 --- a/services/auth-machine/pkg/server/debug/server.go +++ b/services/auth-machine/pkg/server/debug/server.go @@ -3,7 +3,6 @@ package debug import ( "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" "github.com/owncloud/ocis/v2/ocis-pkg/version" ) @@ -12,11 +11,6 @@ import ( func Server(opts ...Option) (*http.Server, error) { options := newOptions(opts...) - checkHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger), - ) - return debug.NewService( debug.Logger(options.Logger), debug.Name(options.Config.Service.Name), @@ -25,8 +19,6 @@ func Server(opts ...Option) (*http.Server, error) { debug.Token(options.Config.Debug.Token), debug.Pprof(options.Config.Debug.Pprof), debug.Zpages(options.Config.Debug.Zpages), - debug.Health(checkHandler), - debug.Ready(checkHandler), //debug.CorsAllowedOrigins(options.Config.HTTP.CORS.AllowedOrigins), //debug.CorsAllowedMethods(options.Config.HTTP.CORS.AllowedMethods), //debug.CorsAllowedHeaders(options.Config.HTTP.CORS.AllowedHeaders), diff --git a/services/auth-service/pkg/server/debug/server.go b/services/auth-service/pkg/server/debug/server.go index 46264bd66b..3ce3b8d3c9 100644 --- a/services/auth-service/pkg/server/debug/server.go +++ b/services/auth-service/pkg/server/debug/server.go @@ -3,7 +3,6 @@ package debug import ( "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" "github.com/owncloud/ocis/v2/ocis-pkg/version" ) @@ -12,11 +11,6 @@ import ( func Server(opts ...Option) (*http.Server, error) { options := newOptions(opts...) - checkHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger), - ) - return debug.NewService( debug.Logger(options.Logger), debug.Name(options.Config.Service.Name), @@ -25,8 +19,6 @@ func Server(opts ...Option) (*http.Server, error) { debug.Token(options.Config.Debug.Token), debug.Pprof(options.Config.Debug.Pprof), debug.Zpages(options.Config.Debug.Zpages), - debug.Health(checkHandler), - debug.Ready(checkHandler), //debug.CorsAllowedOrigins(options.Config.HTTP.CORS.AllowedOrigins), //debug.CorsAllowedMethods(options.Config.HTTP.CORS.AllowedMethods), //debug.CorsAllowedHeaders(options.Config.HTTP.CORS.AllowedHeaders), diff --git a/services/clientlog/pkg/server/debug/server.go b/services/clientlog/pkg/server/debug/server.go index c00ee35b2c..4ca2a6c8fc 100644 --- a/services/clientlog/pkg/server/debug/server.go +++ b/services/clientlog/pkg/server/debug/server.go @@ -13,17 +13,9 @@ import ( func Server(opts ...Option) (*http.Server, error) { options := newOptions(opts...) - checkHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger), - ) - - readyHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger). - WithCheck("nats reachability", checks.NewNatsCheck(options.Config.Events.Cluster)). - WithChecks(checkHandler.Checks()), - ) + readyHandlerConfiguration := handlers.NewCheckHandlerConfiguration(). + WithLogger(options.Logger). + WithCheck("nats reachability", checks.NewNatsCheck(options.Config.Events.Cluster)) return debug.NewService( debug.Logger(options.Logger), @@ -33,7 +25,6 @@ func Server(opts ...Option) (*http.Server, error) { debug.Token(options.Config.Debug.Token), debug.Pprof(options.Config.Debug.Pprof), debug.Zpages(options.Config.Debug.Zpages), - debug.Health(checkHandler), - debug.Ready(readyHandler), + debug.Ready(handlers.NewCheckHandler(readyHandlerConfiguration)), ), nil } diff --git a/services/collaboration/pkg/server/debug/server.go b/services/collaboration/pkg/server/debug/server.go index ce5e8f0201..4612b7c95b 100644 --- a/services/collaboration/pkg/server/debug/server.go +++ b/services/collaboration/pkg/server/debug/server.go @@ -3,7 +3,6 @@ package debug import ( "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" "github.com/owncloud/ocis/v2/ocis-pkg/version" ) @@ -12,11 +11,6 @@ import ( func Server(opts ...Option) (*http.Server, error) { options := newOptions(opts...) - checkHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger), - ) - return debug.NewService( debug.Logger(options.Logger), debug.Name(options.Config.Service.Name+"."+options.Config.App.Name), @@ -25,8 +19,6 @@ func Server(opts ...Option) (*http.Server, error) { debug.Token(options.Config.Debug.Token), debug.Pprof(options.Config.Debug.Pprof), debug.Zpages(options.Config.Debug.Zpages), - debug.Health(checkHandler), - debug.Ready(checkHandler), //debug.CorsAllowedOrigins(options.Config.HTTP.CORS.AllowedOrigins), //debug.CorsAllowedMethods(options.Config.HTTP.CORS.AllowedMethods), //debug.CorsAllowedHeaders(options.Config.HTTP.CORS.AllowedHeaders), diff --git a/services/eventhistory/pkg/server/debug/server.go b/services/eventhistory/pkg/server/debug/server.go index b0f8386b54..e3259472e0 100644 --- a/services/eventhistory/pkg/server/debug/server.go +++ b/services/eventhistory/pkg/server/debug/server.go @@ -13,18 +13,12 @@ import ( func Server(opts ...Option) (*http.Server, error) { options := newOptions(opts...) - checkHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger). - WithCheck("grpc reachability", checks.NewGRPCCheck(options.Config.GRPC.Addr)), - ) + healthHandlerConfiguration := handlers.NewCheckHandlerConfiguration(). + WithLogger(options.Logger). + WithCheck("grpc reachability", checks.NewGRPCCheck(options.Config.GRPC.Addr)) - readyHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger). - WithCheck("nats reachability", checks.NewNatsCheck(options.Config.Events.Cluster)). - WithChecks(checkHandler.Checks()), - ) + readyHandlerConfiguration := healthHandlerConfiguration. + WithCheck("nats reachability", checks.NewNatsCheck(options.Config.Events.Cluster)) return debug.NewService( debug.Logger(options.Logger), @@ -34,7 +28,7 @@ func Server(opts ...Option) (*http.Server, error) { debug.Token(options.Config.Debug.Token), debug.Pprof(options.Config.Debug.Pprof), debug.Zpages(options.Config.Debug.Zpages), - debug.Health(checkHandler), - debug.Ready(readyHandler), + debug.Health(handlers.NewCheckHandler(healthHandlerConfiguration)), + debug.Ready(handlers.NewCheckHandler(readyHandlerConfiguration)), ), nil } diff --git a/services/frontend/pkg/server/debug/server.go b/services/frontend/pkg/server/debug/server.go index 46264bd66b..3ce3b8d3c9 100644 --- a/services/frontend/pkg/server/debug/server.go +++ b/services/frontend/pkg/server/debug/server.go @@ -3,7 +3,6 @@ package debug import ( "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" "github.com/owncloud/ocis/v2/ocis-pkg/version" ) @@ -12,11 +11,6 @@ import ( func Server(opts ...Option) (*http.Server, error) { options := newOptions(opts...) - checkHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger), - ) - return debug.NewService( debug.Logger(options.Logger), debug.Name(options.Config.Service.Name), @@ -25,8 +19,6 @@ func Server(opts ...Option) (*http.Server, error) { debug.Token(options.Config.Debug.Token), debug.Pprof(options.Config.Debug.Pprof), debug.Zpages(options.Config.Debug.Zpages), - debug.Health(checkHandler), - debug.Ready(checkHandler), //debug.CorsAllowedOrigins(options.Config.HTTP.CORS.AllowedOrigins), //debug.CorsAllowedMethods(options.Config.HTTP.CORS.AllowedMethods), //debug.CorsAllowedHeaders(options.Config.HTTP.CORS.AllowedHeaders), diff --git a/services/gateway/pkg/server/debug/server.go b/services/gateway/pkg/server/debug/server.go index 46264bd66b..3ce3b8d3c9 100644 --- a/services/gateway/pkg/server/debug/server.go +++ b/services/gateway/pkg/server/debug/server.go @@ -3,7 +3,6 @@ package debug import ( "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" "github.com/owncloud/ocis/v2/ocis-pkg/version" ) @@ -12,11 +11,6 @@ import ( func Server(opts ...Option) (*http.Server, error) { options := newOptions(opts...) - checkHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger), - ) - return debug.NewService( debug.Logger(options.Logger), debug.Name(options.Config.Service.Name), @@ -25,8 +19,6 @@ func Server(opts ...Option) (*http.Server, error) { debug.Token(options.Config.Debug.Token), debug.Pprof(options.Config.Debug.Pprof), debug.Zpages(options.Config.Debug.Zpages), - debug.Health(checkHandler), - debug.Ready(checkHandler), //debug.CorsAllowedOrigins(options.Config.HTTP.CORS.AllowedOrigins), //debug.CorsAllowedMethods(options.Config.HTTP.CORS.AllowedMethods), //debug.CorsAllowedHeaders(options.Config.HTTP.CORS.AllowedHeaders), diff --git a/services/groups/pkg/server/debug/server.go b/services/groups/pkg/server/debug/server.go index 46264bd66b..3ce3b8d3c9 100644 --- a/services/groups/pkg/server/debug/server.go +++ b/services/groups/pkg/server/debug/server.go @@ -3,7 +3,6 @@ package debug import ( "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" "github.com/owncloud/ocis/v2/ocis-pkg/version" ) @@ -12,11 +11,6 @@ import ( func Server(opts ...Option) (*http.Server, error) { options := newOptions(opts...) - checkHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger), - ) - return debug.NewService( debug.Logger(options.Logger), debug.Name(options.Config.Service.Name), @@ -25,8 +19,6 @@ func Server(opts ...Option) (*http.Server, error) { debug.Token(options.Config.Debug.Token), debug.Pprof(options.Config.Debug.Pprof), debug.Zpages(options.Config.Debug.Zpages), - debug.Health(checkHandler), - debug.Ready(checkHandler), //debug.CorsAllowedOrigins(options.Config.HTTP.CORS.AllowedOrigins), //debug.CorsAllowedMethods(options.Config.HTTP.CORS.AllowedMethods), //debug.CorsAllowedHeaders(options.Config.HTTP.CORS.AllowedHeaders), diff --git a/services/idm/pkg/server/debug/server.go b/services/idm/pkg/server/debug/server.go index 85136a94de..8099c7bf2b 100644 --- a/services/idm/pkg/server/debug/server.go +++ b/services/idm/pkg/server/debug/server.go @@ -3,7 +3,6 @@ package debug import ( "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" "github.com/owncloud/ocis/v2/ocis-pkg/version" ) @@ -12,11 +11,6 @@ import ( func Server(opts ...Option) (*http.Server, error) { options := newOptions(opts...) - checkHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger), - ) - return debug.NewService( debug.Logger(options.Logger), debug.Name(options.Config.Service.Name), @@ -25,7 +19,5 @@ func Server(opts ...Option) (*http.Server, error) { debug.Token(options.Config.Debug.Token), debug.Pprof(options.Config.Debug.Pprof), debug.Zpages(options.Config.Debug.Zpages), - debug.Health(checkHandler), - debug.Ready(checkHandler), ), nil } diff --git a/services/idp/pkg/server/debug/server.go b/services/idp/pkg/server/debug/server.go index 6ff3ce2968..05349b1c31 100644 --- a/services/idp/pkg/server/debug/server.go +++ b/services/idp/pkg/server/debug/server.go @@ -13,18 +13,12 @@ import ( func Server(opts ...Option) (*http.Server, error) { options := newOptions(opts...) - healthHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger). - WithCheck("http reachability", checks.NewHTTPCheck(options.Config.HTTP.Addr)), - ) + healthHandlerConfiguration := handlers.NewCheckHandlerConfiguration(). + WithLogger(options.Logger). + WithCheck("http reachability", checks.NewHTTPCheck(options.Config.HTTP.Addr)) - readinessHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger). - WithCheck("ldap-check", checks.NewTCPCheck(options.Config.Ldap.URI)). - WithChecks(healthHandler.Checks()), - ) + readyHandlerConfiguration := healthHandlerConfiguration. + WithCheck("ldap-check", checks.NewTCPCheck(options.Config.Ldap.URI)) return debug.NewService( debug.Logger(options.Logger), @@ -34,7 +28,7 @@ func Server(opts ...Option) (*http.Server, error) { debug.Token(options.Config.Debug.Token), debug.Pprof(options.Config.Debug.Pprof), debug.Zpages(options.Config.Debug.Zpages), - debug.Health(healthHandler), - debug.Ready(readinessHandler), + debug.Health(handlers.NewCheckHandler(healthHandlerConfiguration)), + debug.Ready(handlers.NewCheckHandler(readyHandlerConfiguration)), ), nil } diff --git a/services/notifications/pkg/server/debug/server.go b/services/notifications/pkg/server/debug/server.go index 6029bfeb61..4e32fb3623 100644 --- a/services/notifications/pkg/server/debug/server.go +++ b/services/notifications/pkg/server/debug/server.go @@ -14,18 +14,10 @@ import ( func Server(opts ...Option) (*http.Server, error) { options := newOptions(opts...) - checkHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger), - ) - - readyHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger). - WithCheck("nats reachability", checks.NewNatsCheck(options.Config.Notifications.Events.Cluster)). - WithCheck("smtp-check", checks.NewTCPCheck(options.Config.Notifications.SMTP.Host+":"+strconv.Itoa(options.Config.Notifications.SMTP.Port))). - WithChecks(checkHandler.Checks()), - ) + readyHandlerConfiguration := handlers.NewCheckHandlerConfiguration(). + WithLogger(options.Logger). + WithCheck("nats reachability", checks.NewNatsCheck(options.Config.Notifications.Events.Cluster)). + WithCheck("smtp-check", checks.NewTCPCheck(options.Config.Notifications.SMTP.Host+":"+strconv.Itoa(options.Config.Notifications.SMTP.Port))) return debug.NewService( debug.Logger(options.Logger), @@ -35,7 +27,6 @@ func Server(opts ...Option) (*http.Server, error) { debug.Token(options.Config.Debug.Token), debug.Pprof(options.Config.Debug.Pprof), debug.Zpages(options.Config.Debug.Zpages), - debug.Health(checkHandler), - debug.Ready(readyHandler), + debug.Ready(handlers.NewCheckHandler(readyHandlerConfiguration)), ), nil } diff --git a/services/ocdav/pkg/server/debug/server.go b/services/ocdav/pkg/server/debug/server.go index 46264bd66b..3ce3b8d3c9 100644 --- a/services/ocdav/pkg/server/debug/server.go +++ b/services/ocdav/pkg/server/debug/server.go @@ -3,7 +3,6 @@ package debug import ( "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" "github.com/owncloud/ocis/v2/ocis-pkg/version" ) @@ -12,11 +11,6 @@ import ( func Server(opts ...Option) (*http.Server, error) { options := newOptions(opts...) - checkHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger), - ) - return debug.NewService( debug.Logger(options.Logger), debug.Name(options.Config.Service.Name), @@ -25,8 +19,6 @@ func Server(opts ...Option) (*http.Server, error) { debug.Token(options.Config.Debug.Token), debug.Pprof(options.Config.Debug.Pprof), debug.Zpages(options.Config.Debug.Zpages), - debug.Health(checkHandler), - debug.Ready(checkHandler), //debug.CorsAllowedOrigins(options.Config.HTTP.CORS.AllowedOrigins), //debug.CorsAllowedMethods(options.Config.HTTP.CORS.AllowedMethods), //debug.CorsAllowedHeaders(options.Config.HTTP.CORS.AllowedHeaders), diff --git a/services/ocm/pkg/server/debug/server.go b/services/ocm/pkg/server/debug/server.go index 46264bd66b..3ce3b8d3c9 100644 --- a/services/ocm/pkg/server/debug/server.go +++ b/services/ocm/pkg/server/debug/server.go @@ -3,7 +3,6 @@ package debug import ( "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" "github.com/owncloud/ocis/v2/ocis-pkg/version" ) @@ -12,11 +11,6 @@ import ( func Server(opts ...Option) (*http.Server, error) { options := newOptions(opts...) - checkHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger), - ) - return debug.NewService( debug.Logger(options.Logger), debug.Name(options.Config.Service.Name), @@ -25,8 +19,6 @@ func Server(opts ...Option) (*http.Server, error) { debug.Token(options.Config.Debug.Token), debug.Pprof(options.Config.Debug.Pprof), debug.Zpages(options.Config.Debug.Zpages), - debug.Health(checkHandler), - debug.Ready(checkHandler), //debug.CorsAllowedOrigins(options.Config.HTTP.CORS.AllowedOrigins), //debug.CorsAllowedMethods(options.Config.HTTP.CORS.AllowedMethods), //debug.CorsAllowedHeaders(options.Config.HTTP.CORS.AllowedHeaders), diff --git a/services/policies/pkg/server/debug/server.go b/services/policies/pkg/server/debug/server.go index 85136a94de..8099c7bf2b 100644 --- a/services/policies/pkg/server/debug/server.go +++ b/services/policies/pkg/server/debug/server.go @@ -3,7 +3,6 @@ package debug import ( "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" "github.com/owncloud/ocis/v2/ocis-pkg/version" ) @@ -12,11 +11,6 @@ import ( func Server(opts ...Option) (*http.Server, error) { options := newOptions(opts...) - checkHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger), - ) - return debug.NewService( debug.Logger(options.Logger), debug.Name(options.Config.Service.Name), @@ -25,7 +19,5 @@ func Server(opts ...Option) (*http.Server, error) { debug.Token(options.Config.Debug.Token), debug.Pprof(options.Config.Debug.Pprof), debug.Zpages(options.Config.Debug.Zpages), - debug.Health(checkHandler), - debug.Ready(checkHandler), ), nil } diff --git a/services/postprocessing/pkg/server/debug/server.go b/services/postprocessing/pkg/server/debug/server.go index 85136a94de..8099c7bf2b 100644 --- a/services/postprocessing/pkg/server/debug/server.go +++ b/services/postprocessing/pkg/server/debug/server.go @@ -3,7 +3,6 @@ package debug import ( "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" "github.com/owncloud/ocis/v2/ocis-pkg/version" ) @@ -12,11 +11,6 @@ import ( func Server(opts ...Option) (*http.Server, error) { options := newOptions(opts...) - checkHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger), - ) - return debug.NewService( debug.Logger(options.Logger), debug.Name(options.Config.Service.Name), @@ -25,7 +19,5 @@ func Server(opts ...Option) (*http.Server, error) { debug.Token(options.Config.Debug.Token), debug.Pprof(options.Config.Debug.Pprof), debug.Zpages(options.Config.Debug.Zpages), - debug.Health(checkHandler), - debug.Ready(checkHandler), ), nil } diff --git a/services/search/pkg/server/debug/server.go b/services/search/pkg/server/debug/server.go index 4d4a02c628..ddaf60865f 100644 --- a/services/search/pkg/server/debug/server.go +++ b/services/search/pkg/server/debug/server.go @@ -14,24 +14,18 @@ import ( func Server(opts ...Option) (*http.Server, error) { options := newOptions(opts...) - checkHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger). - WithCheck("grpc reachability", checks.NewGRPCCheck(options.Config.GRPC.Addr)), - ) + healthHandlerConfiguration := handlers.NewCheckHandlerConfiguration(). + WithLogger(options.Logger). + WithCheck("grpc reachability", checks.NewGRPCCheck(options.Config.GRPC.Addr)) - readyHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger). - WithCheck("nats reachability", checks.NewNatsCheck(options.Config.Events.Cluster)). - WithCheck("tika-check", func(ctx context.Context) error { - if options.Config.Extractor.Type == "tika" { - return checks.NewTCPCheck(options.Config.Extractor.Tika.TikaURL)(ctx) - } - return nil - }). - WithChecks(checkHandler.Checks()), - ) + readyHandlerConfiguration := healthHandlerConfiguration. + WithCheck("nats reachability", checks.NewNatsCheck(options.Config.Events.Cluster)). + WithCheck("tika-check", func(ctx context.Context) error { + if options.Config.Extractor.Type == "tika" { + return checks.NewTCPCheck(options.Config.Extractor.Tika.TikaURL)(ctx) + } + return nil + }) return debug.NewService( debug.Logger(options.Logger), @@ -41,7 +35,7 @@ func Server(opts ...Option) (*http.Server, error) { debug.Token(options.Config.Debug.Token), debug.Pprof(options.Config.Debug.Pprof), debug.Zpages(options.Config.Debug.Zpages), - debug.Health(checkHandler), - debug.Ready(readyHandler), + debug.Health(handlers.NewCheckHandler(healthHandlerConfiguration)), + debug.Ready(handlers.NewCheckHandler(readyHandlerConfiguration)), ), nil } diff --git a/services/sharing/pkg/server/debug/server.go b/services/sharing/pkg/server/debug/server.go index 46264bd66b..3ce3b8d3c9 100644 --- a/services/sharing/pkg/server/debug/server.go +++ b/services/sharing/pkg/server/debug/server.go @@ -3,7 +3,6 @@ package debug import ( "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" "github.com/owncloud/ocis/v2/ocis-pkg/version" ) @@ -12,11 +11,6 @@ import ( func Server(opts ...Option) (*http.Server, error) { options := newOptions(opts...) - checkHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger), - ) - return debug.NewService( debug.Logger(options.Logger), debug.Name(options.Config.Service.Name), @@ -25,8 +19,6 @@ func Server(opts ...Option) (*http.Server, error) { debug.Token(options.Config.Debug.Token), debug.Pprof(options.Config.Debug.Pprof), debug.Zpages(options.Config.Debug.Zpages), - debug.Health(checkHandler), - debug.Ready(checkHandler), //debug.CorsAllowedOrigins(options.Config.HTTP.CORS.AllowedOrigins), //debug.CorsAllowedMethods(options.Config.HTTP.CORS.AllowedMethods), //debug.CorsAllowedHeaders(options.Config.HTTP.CORS.AllowedHeaders), diff --git a/services/sse/pkg/server/debug/server.go b/services/sse/pkg/server/debug/server.go index b972acc39f..4409dfeac6 100644 --- a/services/sse/pkg/server/debug/server.go +++ b/services/sse/pkg/server/debug/server.go @@ -13,18 +13,12 @@ import ( func Server(opts ...Option) (*http.Server, error) { options := newOptions(opts...) - checkHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger). - WithCheck("web reachability", checks.NewHTTPCheck(options.Config.HTTP.Addr)), - ) + healthHandlerConfiguration := handlers.NewCheckHandlerConfiguration(). + WithLogger(options.Logger). + WithCheck("web reachability", checks.NewHTTPCheck(options.Config.HTTP.Addr)) - readyHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger). - WithCheck("nats reachability", checks.NewNatsCheck(options.Config.Events.Cluster)). - WithChecks(checkHandler.Checks()), - ) + readyHandlerConfiguration := healthHandlerConfiguration. + WithCheck("nats reachability", checks.NewNatsCheck(options.Config.Events.Cluster)) return debug.NewService( debug.Logger(options.Logger), @@ -34,7 +28,7 @@ func Server(opts ...Option) (*http.Server, error) { debug.Token(options.Config.Debug.Token), debug.Pprof(options.Config.Debug.Pprof), debug.Zpages(options.Config.Debug.Zpages), - debug.Health(checkHandler), - debug.Ready(readyHandler), + debug.Health(handlers.NewCheckHandler(healthHandlerConfiguration)), + debug.Ready(handlers.NewCheckHandler(readyHandlerConfiguration)), ), nil } diff --git a/services/storage-publiclink/pkg/server/debug/server.go b/services/storage-publiclink/pkg/server/debug/server.go index 46264bd66b..3ce3b8d3c9 100644 --- a/services/storage-publiclink/pkg/server/debug/server.go +++ b/services/storage-publiclink/pkg/server/debug/server.go @@ -3,7 +3,6 @@ package debug import ( "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" "github.com/owncloud/ocis/v2/ocis-pkg/version" ) @@ -12,11 +11,6 @@ import ( func Server(opts ...Option) (*http.Server, error) { options := newOptions(opts...) - checkHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger), - ) - return debug.NewService( debug.Logger(options.Logger), debug.Name(options.Config.Service.Name), @@ -25,8 +19,6 @@ func Server(opts ...Option) (*http.Server, error) { debug.Token(options.Config.Debug.Token), debug.Pprof(options.Config.Debug.Pprof), debug.Zpages(options.Config.Debug.Zpages), - debug.Health(checkHandler), - debug.Ready(checkHandler), //debug.CorsAllowedOrigins(options.Config.HTTP.CORS.AllowedOrigins), //debug.CorsAllowedMethods(options.Config.HTTP.CORS.AllowedMethods), //debug.CorsAllowedHeaders(options.Config.HTTP.CORS.AllowedHeaders), diff --git a/services/storage-shares/pkg/server/debug/server.go b/services/storage-shares/pkg/server/debug/server.go index 46264bd66b..3ce3b8d3c9 100644 --- a/services/storage-shares/pkg/server/debug/server.go +++ b/services/storage-shares/pkg/server/debug/server.go @@ -3,7 +3,6 @@ package debug import ( "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" "github.com/owncloud/ocis/v2/ocis-pkg/version" ) @@ -12,11 +11,6 @@ import ( func Server(opts ...Option) (*http.Server, error) { options := newOptions(opts...) - checkHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger), - ) - return debug.NewService( debug.Logger(options.Logger), debug.Name(options.Config.Service.Name), @@ -25,8 +19,6 @@ func Server(opts ...Option) (*http.Server, error) { debug.Token(options.Config.Debug.Token), debug.Pprof(options.Config.Debug.Pprof), debug.Zpages(options.Config.Debug.Zpages), - debug.Health(checkHandler), - debug.Ready(checkHandler), //debug.CorsAllowedOrigins(options.Config.HTTP.CORS.AllowedOrigins), //debug.CorsAllowedMethods(options.Config.HTTP.CORS.AllowedMethods), //debug.CorsAllowedHeaders(options.Config.HTTP.CORS.AllowedHeaders), diff --git a/services/storage-system/pkg/server/debug/server.go b/services/storage-system/pkg/server/debug/server.go index 46264bd66b..3ce3b8d3c9 100644 --- a/services/storage-system/pkg/server/debug/server.go +++ b/services/storage-system/pkg/server/debug/server.go @@ -3,7 +3,6 @@ package debug import ( "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" "github.com/owncloud/ocis/v2/ocis-pkg/version" ) @@ -12,11 +11,6 @@ import ( func Server(opts ...Option) (*http.Server, error) { options := newOptions(opts...) - checkHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger), - ) - return debug.NewService( debug.Logger(options.Logger), debug.Name(options.Config.Service.Name), @@ -25,8 +19,6 @@ func Server(opts ...Option) (*http.Server, error) { debug.Token(options.Config.Debug.Token), debug.Pprof(options.Config.Debug.Pprof), debug.Zpages(options.Config.Debug.Zpages), - debug.Health(checkHandler), - debug.Ready(checkHandler), //debug.CorsAllowedOrigins(options.Config.HTTP.CORS.AllowedOrigins), //debug.CorsAllowedMethods(options.Config.HTTP.CORS.AllowedMethods), //debug.CorsAllowedHeaders(options.Config.HTTP.CORS.AllowedHeaders), diff --git a/services/storage-users/pkg/server/debug/server.go b/services/storage-users/pkg/server/debug/server.go index 13fa273ee5..1af70eff77 100644 --- a/services/storage-users/pkg/server/debug/server.go +++ b/services/storage-users/pkg/server/debug/server.go @@ -3,7 +3,6 @@ package debug import ( "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" "github.com/owncloud/ocis/v2/ocis-pkg/version" ) @@ -12,11 +11,6 @@ import ( func Server(opts ...Option) (*http.Server, error) { options := newOptions(opts...) - checkHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger), - ) - return debug.NewService( debug.Logger(options.Logger), debug.Context(options.Context), @@ -26,8 +20,6 @@ func Server(opts ...Option) (*http.Server, error) { debug.Token(options.Config.Debug.Token), debug.Pprof(options.Config.Debug.Pprof), debug.Zpages(options.Config.Debug.Zpages), - debug.Health(checkHandler), - debug.Ready(checkHandler), //debug.CorsAllowedOrigins(options.Config.HTTP.CORS.AllowedOrigins), //debug.CorsAllowedMethods(options.Config.HTTP.CORS.AllowedMethods), //debug.CorsAllowedHeaders(options.Config.HTTP.CORS.AllowedHeaders), diff --git a/services/userlog/pkg/server/debug/server.go b/services/userlog/pkg/server/debug/server.go index b972acc39f..4409dfeac6 100644 --- a/services/userlog/pkg/server/debug/server.go +++ b/services/userlog/pkg/server/debug/server.go @@ -13,18 +13,12 @@ import ( func Server(opts ...Option) (*http.Server, error) { options := newOptions(opts...) - checkHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger). - WithCheck("web reachability", checks.NewHTTPCheck(options.Config.HTTP.Addr)), - ) + healthHandlerConfiguration := handlers.NewCheckHandlerConfiguration(). + WithLogger(options.Logger). + WithCheck("web reachability", checks.NewHTTPCheck(options.Config.HTTP.Addr)) - readyHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger). - WithCheck("nats reachability", checks.NewNatsCheck(options.Config.Events.Cluster)). - WithChecks(checkHandler.Checks()), - ) + readyHandlerConfiguration := healthHandlerConfiguration. + WithCheck("nats reachability", checks.NewNatsCheck(options.Config.Events.Cluster)) return debug.NewService( debug.Logger(options.Logger), @@ -34,7 +28,7 @@ func Server(opts ...Option) (*http.Server, error) { debug.Token(options.Config.Debug.Token), debug.Pprof(options.Config.Debug.Pprof), debug.Zpages(options.Config.Debug.Zpages), - debug.Health(checkHandler), - debug.Ready(readyHandler), + debug.Health(handlers.NewCheckHandler(healthHandlerConfiguration)), + debug.Ready(handlers.NewCheckHandler(readyHandlerConfiguration)), ), nil } diff --git a/services/users/pkg/server/debug/server.go b/services/users/pkg/server/debug/server.go index 46264bd66b..3ce3b8d3c9 100644 --- a/services/users/pkg/server/debug/server.go +++ b/services/users/pkg/server/debug/server.go @@ -3,7 +3,6 @@ package debug import ( "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" "github.com/owncloud/ocis/v2/ocis-pkg/version" ) @@ -12,11 +11,6 @@ import ( func Server(opts ...Option) (*http.Server, error) { options := newOptions(opts...) - checkHandler := handlers.NewCheckHandler( - handlers.NewCheckHandlerConfiguration(). - WithLogger(options.Logger), - ) - return debug.NewService( debug.Logger(options.Logger), debug.Name(options.Config.Service.Name), @@ -25,8 +19,6 @@ func Server(opts ...Option) (*http.Server, error) { debug.Token(options.Config.Debug.Token), debug.Pprof(options.Config.Debug.Pprof), debug.Zpages(options.Config.Debug.Zpages), - debug.Health(checkHandler), - debug.Ready(checkHandler), //debug.CorsAllowedOrigins(options.Config.HTTP.CORS.AllowedOrigins), //debug.CorsAllowedMethods(options.Config.HTTP.CORS.AllowedMethods), //debug.CorsAllowedHeaders(options.Config.HTTP.CORS.AllowedHeaders),