TyleoDvDelaware3217/GoDoxy
1
0
Fork 0
mirror of https://github.com/yusing/godoxy.git synced 2025-06-07 12:02:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(route): incorrect health status for idlewatcher dependencies

Browse source
This commit is contained in:
yusing 2025-06-05 18:40:40 +08:00
parent 9470a14fe8
commit d240da4393
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
internal/idlewatcher/watcher.go
View file

@ -69,8 +69,6 @@ type (
const ContextKey = "idlewatcher.watcher" const ContextKey = "idlewatcher.watcher"
// TODO: replace -1 with neverTick
var ( var (
watcherMap = make(map[string]*Watcher) watcherMap = make(map[string]*Watcher)
watcherMapMu sync.RWMutex watcherMapMu sync.RWMutex
@ -315,6 +313,8 @@ func NewWatcher(parent task.Parent, r routes.Route, cfg *idlewatcher.Config) (*W
w.dedupDependencies() w.dedupDependencies()
r.SetHealthMonitor(w)
w.l = w.l.With().Strs("deps", cfg.DependsOn).Logger() w.l = w.l.With().Strs("deps", cfg.DependsOn).Logger()
if exists { if exists {
w.l.Debug().Msg("idlewatcher reloaded") w.l.Debug().Msg("idlewatcher reloaded")

7
internal/route/route.go
View file

@ -366,6 +366,13 @@ func (r *Route) HealthMonitor() health.HealthMonitor {
return r.HealthMon return r.HealthMon
} }
func (r *Route) SetHealthMonitor(m health.HealthMonitor) {
if r.HealthMon != nil && r.HealthMon != m {
r.HealthMon.Finish("health monitor replaced")
}
r.HealthMon = m
}
func (r *Route) IdlewatcherConfig() *idlewatcher.Config { func (r *Route) IdlewatcherConfig() *idlewatcher.Config {
return r.Idlewatcher return r.Idlewatcher
} }

1
internal/route/routes/route.go
View file

@ -26,6 +26,7 @@ type (
GetProvider() Provider GetProvider() Provider
TargetURL() *net.URL TargetURL() *net.URL
HealthMonitor() health.HealthMonitor HealthMonitor() health.HealthMonitor
SetHealthMonitor(m health.HealthMonitor)
References() []string References() []string
Started() <-chan struct{} Started() <-chan struct{}