serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-26 21:53:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: Revert 7f364c7; simplify dynamic config load

Browse source 
Fixes #4577
This commit is contained in:
Matthew Holt 2022-03-01 13:00:14 -07:00
parent 7ea5b2a818
commit acbee94708
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
1 changed files with 23 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
caddy.go
View file

@ -148,7 +148,7 @@ func changeConfig(method, path string, input []byte, forceReload bool) error {
// if nothing changed, no need to do a whole reload unless the client forces it // if nothing changed, no need to do a whole reload unless the client forces it
if !forceReload && bytes.Equal(rawCfgJSON, newCfg) { if !forceReload && bytes.Equal(rawCfgJSON, newCfg) {
Log().Named("admin.api").Info("config is unchanged") Log().Info("config is unchanged")
return nil return nil
} }
@ -480,51 +480,37 @@ func finishSettingUp(ctx Context, cfg *Config) error {
if err != nil { if err != nil {
return fmt.Errorf("loading config loader module: %s", err) return fmt.Errorf("loading config loader module: %s", err)
} }
logger := Log().Named("config_loader").With(
zap.String("module", val.(Module).CaddyModule().ID.Name()),
zap.Int("pull_interval", int(cfg.Admin.Config.LoadInterval)))
runLoadedConfig := func(config []byte) { runLoadedConfig := func(config []byte) {
currentCfgMu.Lock() logger.Info("applying dynamically-loaded config")
defer currentCfgMu.Unlock() err := changeConfig(http.MethodPost, "/"+rawConfigKey, config, false)
// Skip if there is no change in the config
if bytes.Equal(rawCfgJSON, config) {
return
}
Log().Info("applying dynamically-loaded config", zap.String("loader_module", val.(Module).CaddyModule().ID.Name()), zap.Int("pull_interval", int(cfg.Admin.Config.LoadInterval)))
err := unsyncedDecodeAndRun(config, false)
if err == nil { if err == nil {
// success, so update our stored copy of the encoded logger.Info("successfully applied dynamically-loaded config")
// config to keep it consistent with what caddy is now
// running (storing an encoded copy is not strictly
// necessary, but avoids an extra json.Marshal for
// each config change)
rawCfgJSON = config
Log().Info("dynamically-loaded config applied successfully")
} else { } else {
Log().Error("running dynamically-loaded config failed", zap.Error(err)) logger.Error("failed to run dynamically-loaded config", zap.Error(err))
} }
} }
if cfg.Admin.Config.LoadInterval > 0 { if cfg.Admin.Config.LoadInterval > 0 {
go func() { go func() {
for { timer := time.NewTimer(time.Duration(cfg.Admin.Config.LoadInterval))
timer := time.NewTimer(time.Duration(cfg.Admin.Config.LoadInterval)) select {
select { case <-timer.C:
// if LoadInterval is positive, will wait for the interval and then run with new config loadedConfig, err := val.(ConfigLoader).LoadConfig(ctx)
case <-timer.C: if err != nil {
loadedConfig, err := val.(ConfigLoader).LoadConfig(ctx) Log().Error("loading dynamic config failed", zap.Error(err))
if err != nil {
Log().Error("loading dynamic config failed", zap.Error(err))
return
}
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 return
} }
runLoadedConfig(loadedConfig)
case <-ctx.Done():
if !timer.Stop() {
<-timer.C
}
Log().Info("stopping config load interval")
} }
}() }()
} else { } else {
@ -536,7 +522,6 @@ func finishSettingUp(ctx Context, cfg *Config) error {
// do this in a goroutine so current config can finish being loaded; otherwise deadlock // do this in a goroutine so current config can finish being loaded; otherwise deadlock
go runLoadedConfig(loadedConfig) go runLoadedConfig(loadedConfig)
} }
} }
return nil return nil