add sync server list timeout

apolloconfig · Apr 10, 2021 · fd81f9b · fd81f9b
1 parent 26269e4
commit fd81f9b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/component/serverlist/sync.go b/component/serverlist/sync.go
@@ -20,6 +20,7 @@ package serverlist
 import (
 	"encoding/json"
 	"github.com/zouyx/agollo/v4/env/server"
+	"strconv"
 	"time"
 
 	"github.com/zouyx/agollo/v4/component"
@@ -74,10 +75,18 @@ func SyncServerIPList(appConfigFunc func() config.AppConfig) (map[string]*config
 	}
 
 	appConfig := appConfigFunc()
-	serverMap, err := http.Request(appConfig.GetServicesConfigURL(), &env.ConnectConfig{
+	c := &env.ConnectConfig{
 		AppID:  appConfig.AppID,
 		Secret: appConfig.Secret,
-	}, &http.CallBack{
+	}
+	if appConfigFunc().SyncServerTimeout > 0 {
+		duration, err := time.ParseDuration(strconv.Itoa(appConfigFunc().SyncServerTimeout) + "s")
+		if err != nil {
+			return nil, err
+		}
+		c.Timeout = duration
+	}
+	serverMap, err := http.Request(appConfig.GetServicesConfigURL(), c, &http.CallBack{
 		SuccessCallBack: SyncServerIPListSuccessCallBack,
 		AppConfigFunc:   appConfigFunc,
 	})

diff --git a/component/serverlist/sync_test.go b/component/serverlist/sync_test.go
@@ -53,6 +53,7 @@ func getTestAppConfig() *config.AppConfig {
     "cluster": "dev",
     "namespaceName": "application",
     "ip": "localhost:8888",
+	"syncServerTimeout":2,
     "releaseKey": "1"
 	}`
 	c, _ := env.Unmarshal([]byte(jsonStr))

diff --git a/env/config/config.go b/env/config/config.go
@@ -47,6 +47,7 @@ type AppConfig struct {
 	IsBackupConfig          bool   `default:"true" json:"isBackupConfig"`
 	BackupConfigPath        string `json:"backupConfigPath"`
 	Secret                  string `json:"secret"`
+	SyncServerTimeout       int    `json:"syncServerTimeout"`
 	notificationsMap        *notificationsMap
 	currentConnApolloConfig *CurrentApolloConfig
 }