sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2786 from opencloud-eu/fix/duplicate-service-field-in-debug-log

Browse Source 
fix(debug): drop duplicate service field from probe fallback log
This commit is contained in:
Ralf Haferkamp
2026-05-19 12:13:39 +02:00
committed by GitHub
parent 66fae3061d 0ad6112dd2
commit 33e33eaa36
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/service/debug/service.go
+3 -6
View File
@@ -18,11 +18,10 @@ import (
graphMiddleware "github.com/opencloud-eu/opencloud/services/graph/pkg/middleware" 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 { if h == nil {
h = handlers.NewCheckHandler(handlers.NewCheckHandlerConfiguration()) h = handlers.NewCheckHandler(handlers.NewCheckHandlerConfiguration())
logger.Info(). logger.Info().
Str("service", name).
Str("endpoint", pattern). Str("endpoint", pattern).
Msg("no probe provided, reverting to default (OK)") Msg("no probe provided, reverting to default (OK)")
} }
@@ -30,8 +29,6 @@ var handleProbe = func(mux *http.ServeMux, pattern string, h http.Handler, name
mux.Handle(pattern, h) mux.Handle(pattern, h)
} }
//var probeHandler = func(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusOK) }
// NewService initializes a new debug service. // NewService initializes a new debug service.
func NewService(opts ...Option) *http.Server { func NewService(opts ...Option) *http.Server {
dopts := newOptions(opts...) dopts := newOptions(opts...)
@@ -45,8 +42,8 @@ func NewService(opts ...Option) *http.Server {
promhttp.Handler(), promhttp.Handler(),
)) ))
handleProbe(mux, "/healthz", dopts.Health, dopts.Name, dopts.Logger) // healthiness check handleProbe(mux, "/healthz", dopts.Health, dopts.Logger) // healthiness check
handleProbe(mux, "/readyz", dopts.Ready, dopts.Name, dopts.Logger) // readiness check handleProbe(mux, "/readyz", dopts.Ready, dopts.Logger) // readiness check
if dopts.ConfigDump != nil { if dopts.ConfigDump != nil {
mux.Handle("/config", dopts.ConfigDump) mux.Handle("/config", dopts.ConfigDump)