core: Load config at interval instead of just once

caddyserver · Nov 16, 2021 · 7f364c7 · 7f364c7 · mholt · Mar 1, 2022
1 parent b47af6e
commit 7f364c7
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/caddy.go b/caddy.go
@@ -493,17 +493,20 @@ func finishSettingUp(ctx Context, cfg *Config) error {
 		}
 		if cfg.Admin.Config.LoadInterval > 0 {
 			go func() {
-				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)):
-					loadedConfig, err := val.(ConfigLoader).LoadConfig(ctx)
-					if err != nil {
-						Log().Error("loading dynamic config failed", zap.Error(err))
+				for {
+					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)):
+						loadedConfig, err := val.(ConfigLoader).LoadConfig(ctx)
+						if err != nil {
+							Log().Error("loading dynamic config failed", zap.Error(err))
+							return
+						}
+						runLoadedConfig(loadedConfig)
+					case <-ctx.Done():
+						Log().Info("stopping config load interval")
 						return
 					}
-					runLoadedConfig(loadedConfig)
-				case <-ctx.Done():
-					return
 				}
 			}()
 		} else {