Refactor relay config reloading logic

Ehco1996 · Jan 18, 2024 · 85b3c88 · 85b3c88
1 parent 50087c7
commit 85b3c88
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 20 deletions.
diff --git a/cmd/ehco/main.go b/cmd/ehco/main.go
@@ -254,7 +254,8 @@ func startRelayServers(ctx context.Context, cfg *config.Config) error {
 		}
 		go startOneRelay(r, relayM, errCH)
 	}
-	if ConfigPath != "" {
+	if cfg.PATH != "" && cfg.ReloadInterval > 0 {
+		cmdLogger.Infof("Start to watch relay config %s ", ConfigPath)
 		go watchAndReloadRelayConfig(ctx, cfg, relayM, errCH)
 	}
 
@@ -272,17 +273,16 @@ func startRelayServers(ctx context.Context, cfg *config.Config) error {
 	}
 }
 
-func watchAndReloadRelayConfig(ctx context.Context, curCfg *config.Config, relayM *sync.Map, errCh chan error) {
-	cmdLogger.Infof("Start to watch relay config %s ", ConfigPath)
+func watchAndReloadRelayConfig(ctx context.Context, cfg *config.Config, relayM *sync.Map, errCh chan error) {
 	reladRelayF := func() error {
-		newCfg, err := loadConfig()
-		if err != nil {
+		// load new config
+		if err := cfg.LoadConfig(); err != nil {
 			cmdLogger.Errorf("Reloading Realy Conf meet error: %s ", err)
 			return err
 		}
 		var newRelayAddrList []string
-		for idx := range newCfg.RelayConfigs {
-			r, err := relay.NewRelay(newCfg.RelayConfigs[idx])
+		for idx := range cfg.RelayConfigs {
+			r, err := relay.NewRelay(cfg.RelayConfigs[idx])
 			if err != nil {
 				cmdLogger.Errorf("reload new relay failed err=%s", err.Error())
 				return err
@@ -333,20 +333,18 @@ func watchAndReloadRelayConfig(ctx context.Context, curCfg *config.Config, relay
 	}()
 
 	// ticker to reload config
-	if curCfg.ReloadInterval > 0 {
-		ticker := time.NewTicker(time.Second * time.Duration(curCfg.ReloadInterval))
-		defer ticker.Stop()
-		go func() {
-			for {
-				select {
-				case <-ctx.Done():
-					return
-				case <-ticker.C:
-					reloadCH <- struct{}{}
-				}
+	ticker := time.NewTicker(time.Second * time.Duration(cfg.ReloadInterval))
+	defer ticker.Stop()
+	go func() {
+		for {
+			select {
+			case <-ctx.Done():
+				return
+			case <-ticker.C:
+				reloadCH <- struct{}{}
 			}
-		}()
-	}
+		}
+	}()
 
 	for {
 		select {

diff --git a/internal/config/config.go b/internal/config/config.go
@@ -77,6 +77,8 @@ type Config struct {
 	SyncTrafficEndPoint string          `json:"sync_traffic_endpoint"`
 
 	L *zap.SugaredLogger
+
+	lastLoadTime time.Time
 }
 
 func NewConfig(path string) *Config {
@@ -88,6 +90,11 @@ func (c *Config) NeedSyncUserFromServer() bool {
 }
 
 func (c *Config) LoadConfig() error {
+	if c.ReloadInterval > 0 && time.Since(c.lastLoadTime).Seconds() < float64(c.ReloadInterval) {
+		c.L.Debugf("Skip Load Config, last load time: %s", c.lastLoadTime)
+		return nil
+	}
+	c.lastLoadTime = time.Now()
 	if c.NeedSyncUserFromServer() {
 		if err := c.readFromHttp(); err != nil {
 			return err