From a371b5f962bdac6c27155579237eb8ac870e23ce Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期一, 31 五月 2021 16:32:33 +0800
Subject: [PATCH] fix Init arg
---
config.go | 41 ++++++++++++++++++++++++++++++++---------
1 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/config.go b/config.go
index 79b07a5..643226a 100644
--- a/config.go
+++ b/config.go
@@ -19,11 +19,14 @@
import (
"fmt"
"net"
+ "os"
"strconv"
+ "strings"
+
//"github.com/apache/servicecomb-service-center/syncer/pkg/utils"
"github.com/hashicorp/memberlist"
- "github.com/hashicorp/serf/cmd/serf/command/agent"
- "github.com/hashicorp/serf/serf"
+ "basic.com/valib/serf.git/cmd/serf/command/agent"
+ "basic.com/valib/serf.git/serf"
)
const (
@@ -47,8 +50,6 @@
ReplayOnJoinDefault = false
SnapshotPathDefault = "./serfSnapShot"
MaxEventBufferCount = 2048
-
- TcpTransportPort = 30194 //tcp浼犺緭澶ф暟鎹噺鎺ュ彛
)
// DefaultConfig default config
@@ -70,14 +71,14 @@
type Config struct {
// config from serf agent
*agent.Config
- Mode string `json:"mode"`
+ Mode string `json:"mode"`
// name to group members into cluster
- ClusterID string `json:"cluster_name"`
+ ClusterID string `json:"cluster_name"`
// port to communicate between cluster members
- ClusterPort int `yaml:"cluster_port"`
- RPCPort int `yaml:"-"`
+ ClusterPort int `yaml:"cluster_port"`
+ RPCPort int `yaml:"-"`
}
// readConfigFile reads configuration from config file
@@ -86,6 +87,28 @@
// todo:
}
return nil
+}
+
+func isFileRightful(filePath string) bool {
+ if filePath != "" {
+ _, err := os.Stat(filePath)
+ if err != nil && os.IsNotExist(err) {
+ pos := strings.LastIndex(filePath, "/")
+ if pos != -1 {
+ filePath = filePath[0:pos]
+ }
+
+ _, err = os.Stat(filePath)
+ if err == nil || !os.IsNotExist(err) {
+ return true
+ } else {
+ return false
+ }
+ } else {
+ return false
+ }
+ }
+ return false
}
// convertToSerf convert Config to serf.Config
@@ -124,7 +147,7 @@
}
c.SnapshotPath = SnapshotPathDefault
- if snapshotPath != "" {
+ if isFileRightful(snapshotPath) {
c.SnapshotPath = snapshotPath
}
--
Gitblit v1.8.0