Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions pkg/service/debug/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,17 @@ import (
graphMiddleware "github.com/opencloud-eu/opencloud/services/graph/pkg/middleware"
)

var handleProbe = func(mux *http.ServeMux, pattern string, h http.Handler, name string, logger log.Logger) {
var handleProbe = func(mux *http.ServeMux, pattern string, h http.Handler, 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...)
Expand All @@ -45,8 +42,8 @@ func NewService(opts ...Option) *http.Server {
promhttp.Handler(),
))

handleProbe(mux, "/healthz", dopts.Health, dopts.Name, dopts.Logger) // healthiness check
handleProbe(mux, "/readyz", dopts.Ready, dopts.Name, dopts.Logger) // readiness check
handleProbe(mux, "/healthz", dopts.Health, dopts.Logger) // healthiness check
handleProbe(mux, "/readyz", dopts.Ready, dopts.Logger) // readiness check

if dopts.ConfigDump != nil {
mux.Handle("/config", dopts.ConfigDump)
Expand Down