mirror of
https://github.com/opencloud-eu/opencloud.git
synced 2026-05-24 22:19:09 -05:00
Merge pull request #2786 from opencloud-eu/fix/duplicate-service-field-in-debug-log
fix(debug): drop duplicate service field from probe fallback log
This commit is contained in:
@@ -18,11 +18,10 @@ 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)")
|
||||
}
|
||||
@@ -30,8 +29,6 @@ var handleProbe = func(mux *http.ServeMux, pattern string, h http.Handler, name
|
||||
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...)
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user