diff --git a/internal/config/events.go b/internal/config/events.go index 793a1036..1f6859f2 100644 --- a/internal/config/events.go +++ b/internal/config/events.go @@ -10,6 +10,7 @@ import ( "github.com/yusing/godoxy/internal/common" config "github.com/yusing/godoxy/internal/config/types" "github.com/yusing/godoxy/internal/notif" + "github.com/yusing/godoxy/internal/route/routes" "github.com/yusing/godoxy/internal/watcher" "github.com/yusing/godoxy/internal/watcher/events" gperr "github.com/yusing/goutils/errs" @@ -59,6 +60,15 @@ func Load() error { cfgWatcher = watcher.NewConfigFileWatcher(common.ConfigFileName) + // disable pool logging temporary since we already have pretty logging + routes.HTTP.DisableLog(true) + routes.Stream.DisableLog(true) + + defer func() { + routes.HTTP.DisableLog(false) + routes.Stream.DisableLog(false) + }() + initErr := state.InitFromFile(common.ConfigPath) err := errors.Join(initErr, state.StartProviders()) if err != nil { diff --git a/internal/config/state.go b/internal/config/state.go index dbc4ac4a..1dac34fe 100644 --- a/internal/config/state.go +++ b/internal/config/state.go @@ -28,7 +28,6 @@ import ( "github.com/yusing/godoxy/internal/maxmind" "github.com/yusing/godoxy/internal/notif" route "github.com/yusing/godoxy/internal/route/provider" - "github.com/yusing/godoxy/internal/route/routes" "github.com/yusing/godoxy/internal/serialization" "github.com/yusing/godoxy/internal/types" gperr "github.com/yusing/goutils/errs" @@ -323,15 +322,6 @@ func (state *state) storeProvider(p types.RouteProvider) { } func (state *state) loadRouteProviders() error { - // disable pool logging temporary since we will have pretty logging below - routes.HTTP.DisableLog(true) - routes.Stream.DisableLog(true) - - defer func() { - routes.HTTP.DisableLog(false) - routes.Stream.DisableLog(false) - }() - providers := &state.Providers errs := gperr.NewGroup("route provider errors") results := gperr.NewGroup("loaded route providers")