Stowage/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-12-08 06:09:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Stop rotation goroutine on config unload

Browse source
This commit is contained in:
Matthew Holt 2025-11-24 15:54:05 -07:00
parent 57d6671ac6
commit 04e70bbaa0
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
modules/caddytls/tls.go
View file

@ -423,13 +423,18 @@ func (t *TLS) Start() error {
// keep ECH keys rotated
go func() {
for range time.Tick(1 * time.Hour) {
// ensure old keys are rotated out
t.EncryptedClientHello.configsMu.Lock()
err = t.EncryptedClientHello.rotateECHKeys(t.ctx, echLogger, false)
t.EncryptedClientHello.configsMu.Unlock()
if err != nil {
echLogger.Error("rotating ECH configs failed", zap.Error(err))
for {
select {
case <-time.After(1 * time.Hour):
// ensure old keys are rotated out
t.EncryptedClientHello.configsMu.Lock()
err = t.EncryptedClientHello.rotateECHKeys(t.ctx, echLogger, false)
t.EncryptedClientHello.configsMu.Unlock()
if err != nil {
echLogger.Error("rotating ECH configs failed", zap.Error(err))
}
case <-t.ctx.Done():
return
}
}
}()