github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-11-22 12:24:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

admin, reverseproxy: Stop timers if canceled to avoid goroutine leak (#4482)

Browse Source
This commit is contained in:
Денис Телюх 2022-01-05 02:14:18 +07:00 committed by GitHub
parent 249adc1c87
commit 2e46c2ac1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
caddy.go
View File

@ -494,9 +494,10 @@ func finishSettingUp(ctx Context, cfg *Config) error {
if cfg.Admin.Config.LoadInterval > 0 {
go func() {
for {
timer := time.NewTimer(time.Duration(cfg.Admin.Config.LoadInterval))
select {
// if LoadInterval is positive, will wait for the interval and then run with new config
case <-time.After(time.Duration(cfg.Admin.Config.LoadInterval)):
case <-timer.C:
loadedConfig, err := val.(ConfigLoader).LoadConfig(ctx)
if err != nil {
Log().Error("loading dynamic config failed", zap.Error(err))
@ -504,6 +505,10 @@ func finishSettingUp(ctx Context, cfg *Config) error {
}
runLoadedConfig(loadedConfig)
case <-ctx.Done():
if !timer.Stop() {
// if the timer has been stopped then read from the channel
<-timer.C
}
Log().Info("stopping config load interval")
return
}

7
modules/caddyhttp/reverseproxy/reverseproxy.go
View File

@ -792,10 +792,15 @@ func (lb LoadBalancing) tryAgain(ctx caddy.Context, start time.Time, proxyErr er
}
// otherwise, wait and try the next available host
timer := time.NewTimer(time.Duration(lb.TryInterval))
select {
case <-time.After(time.Duration(lb.TryInterval)):
case <-timer.C:
return true
case <-ctx.Done():
if !timer.Stop() {
// if the timer has been stopped then read from the channel
<-timer.C
}
return false
}
}