Finish v4.3.1

Author: zouyx

client.go

@@ -20,6 +20,7 @@ package agollo
 import (
 	"container/list"
 	"errors"
+
 	"github.com/apolloconfig/agollo/v4/agcache"
 	"github.com/apolloconfig/agollo/v4/agcache/memory"
 	"github.com/apolloconfig/agollo/v4/cluster/roundrobin"
@@ -239,7 +240,7 @@ func (c *internalClient) getConfigValue(key string) interface{} {
 
 	value, err := cache.Get(key)
 	if err != nil {
-		log.Errorf("get config value fail!key:%s,err:%s", key, err)
+		log.Errorf("get config value fail! key:%s, error:%v", key, err)
 		return utils.Empty
 	}
 

component/common_test.go

@@ -146,7 +146,7 @@ func SyncServerIPListSuccessCallBack(responseBody []byte, callback http.CallBack
 	err = json2.Unmarshal(responseBody, &tmpServerInfo)
 
 	if err != nil {
-		log.Errorf("Unmarshal json Fail,Error: %s", err)
+		log.Errorf("Unmarshal json Fail, error: %v", err)
 		return
 	}
 

component/remote/abs.go

@@ -49,7 +49,7 @@ func (a *AbsApolloConfig) SyncWithNamespace(namespace string, appConfigFunc func
 	if appConfig.SyncServerTimeout > 0 {
 		duration, err := time.ParseDuration(strconv.Itoa(appConfig.SyncServerTimeout) + "s")
 		if err != nil {
-			log.Errorf("parse sync server timeout %s fail, error:%v", err)
+			log.Errorf("parse sync server timeout %s fail, error:%v", appConfig.SyncServerTimeout, err)
 			return nil
 		}
 		c.Timeout = duration

component/remote/async.go

@@ -138,7 +138,7 @@ func toApolloConfig(resBody []byte) ([]*config.Notification, error) {
 	err := json.Unmarshal(resBody, &remoteConfig)
 
 	if err != nil {
-		log.Errorf("Unmarshal Msg Fail,Error: %v", err)
+		log.Errorf("Unmarshal Msg Fail, error: %v", err)
 		return nil, err
 	}
 	return remoteConfig, nil
@@ -182,7 +182,7 @@ func createApolloConfigWithJSON(b []byte, callback http.CallBack) (o interface{}
 	}
 	m, err := parser.Parse(content)
 	if err != nil {
-		log.Debugf("GetContent fail ! error: %v", err)
+		log.Debugf("GetContent fail! error: %v", err)
 	}
 
 	if len(m) > 0 {

component/remote/sync.go

@@ -90,7 +90,7 @@ func processJSONFiles(b []byte, callback http.CallBack) (o interface{}, err erro
 	}
 	m, err := parser.Parse(content)
 	if err != nil {
-		log.Debugf("GetContent fail ! error: %v", err)
+		log.Debugf("GetContent fail! error: %v", err)
 	}
 
 	if len(m) > 0 {

component/serverlist/sync.go

@@ -109,7 +109,7 @@ func SyncServerIPListSuccessCallBack(responseBody []byte, callback http.CallBack
 	err = json.Unmarshal(responseBody, &tmpServerInfo)
 
 	if err != nil {
-		log.Error("Unmarshal json Fail,Error: %v", err)
+		log.Errorf("Unmarshal json Fail, error: %v", err)
 		return
 	}
 

env/config/json/json_config.go

@@ -55,7 +55,7 @@ func (t *ConfigFile) Write(content interface{}, configPath string) error {
 	}
 	file, e := os.Create(configPath)
 	if e != nil {
-		log.Errorf("writeConfigFile fail,error: %v", e)
+		log.Errorf("writeConfigFile fail, error: %v", e)
 		return e
 	}
 	defer file.Close()

env/file/json/json.go

@@ -61,7 +61,7 @@ func (fileHandler *FileHandler) createDir(configPath string) error {
 	if !configFileDirMap[configPath] {
 		err := os.MkdirAll(configPath, os.ModePerm)
 		if err != nil && !os.IsExist(err) {
-			log.Errorf("Create backup dir:%s fail,error:&s", configPath, err)
+			log.Errorf("Create backup dir:%s fail, error:%v", configPath, err)
 			return err
 		}
 		configFileDirMap[configPath] = true
@@ -106,7 +106,7 @@ func (fileHandler *FileHandler) LoadConfigFile(configDir string, appID string, n
 	})
 
 	if c == nil || e != nil {
-		log.Errorf("loadConfigFile fail,error:", e)
+		log.Errorf("loadConfigFile fail, error:%v", e)
 		return nil, e
 	}
 

env/file/json/raw.go

@@ -68,7 +68,7 @@ func (fileHandler *rawFileHandler) WriteConfigFile(config *config.ApolloConfig,
 
 	err = writeWithRaw(config, configPath)
 	if err != nil {
-		log.Errorf("writeWithRaw fail! ", err)
+		log.Errorf("writeWithRaw fail! error:%v", err)
 	}
 	return jsonFileConfig.Write(config, fileHandler.GetConfigFile(configPath, config.AppID, config.NamespaceName))
 }

env/server/server.go

@@ -43,7 +43,7 @@ type Info struct {
 	nextTryConnTime int64
 }
 
-//GetServersLen 获取服务器数组
+// GetServersLen 获取服务器数组
 func GetServers(configIp string) map[string]*config.ServerInfo {
 	serverLock.Lock()
 	defer serverLock.Unlock()
@@ -53,7 +53,7 @@ func GetServers(configIp string) map[string]*config.ServerInfo {
 	return ipMap[configIp].serverMap
 }
 
-//GetServersLen 获取服务器数组长度
+// GetServersLen 获取服务器数组长度
 func GetServersLen(configIp string) int {
 	serverLock.Lock()
 	defer serverLock.Unlock()
@@ -72,7 +72,7 @@ func SetServers(configIp string, serverMap map[string]*config.ServerInfo) {
 	}
 }
 
-//SetDownNode 设置失效节点
+// SetDownNode 设置失效节点
 func SetDownNode(configService string, serverHost string) {
 	serverLock.Lock()
 	defer serverLock.Unlock()
@@ -99,15 +99,15 @@ func SetDownNode(configService string, serverHost string) {
 
 	for k, server := range s.serverMap {
 		// if some node has down then select next node
-		if strings.Index(k, serverHost) > -1 {
+		if strings.Contains(k, serverHost) {
 			server.IsDown = true
 		}
 	}
 }
 
-//IsConnectDirectly is connect by ip directly
-//false : yes
-//true : no
+// IsConnectDirectly is connect by ip directly
+// false : yes
+// true : no
 func IsConnectDirectly(configIp string) bool {
 	serverLock.Lock()
 	defer serverLock.Unlock()
@@ -122,7 +122,7 @@ func IsConnectDirectly(configIp string) bool {
 	return false
 }
 
-//SetNextTryConnTime if this connect is fail will set this time
+// SetNextTryConnTime if this connect is fail will set this time
 func SetNextTryConnTime(configIp string, nextPeriod int64) {
 	serverLock.Lock()
 	defer serverLock.Unlock()