From 3bcef90cd935c8a81fc6b6e0351138de45dc03be Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期三, 16 九月 2020 18:26:09 +0800
Subject: [PATCH] fix import
---
config.go | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/config.go b/config.go
index db59252..81b019b 100644
--- a/config.go
+++ b/config.go
@@ -19,12 +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 (
@@ -46,7 +48,7 @@
MaxQuerySize = 50 * 1024 * 1024
MaxUserEventSize = 9 * 1024
ReplayOnJoinDefault = false
- SnapshotPathDefault = "/opt/vasystem/serfSnapShot"
+ SnapshotPathDefault = "./serfSnapShot"
MaxEventBufferCount = 2048
TcpTransportPort = 30194 //tcp浼犺緭澶ф暟鎹噺鎺ュ彛
@@ -89,8 +91,30 @@
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
-func (c *Config) convertToSerf() (*serf.Config, error) {
+func (c *Config) convertToSerf(snapshotPath string) (*serf.Config, error) {
serfConf := serf.DefaultConfig()
bindIP, bindPort, err := SplitHostPort(c.BindAddr, DefaultBindPort)
@@ -123,7 +147,12 @@
if c.Mode == ModeCluster && c.RetryMaxAttempts <= 0 {
c.RetryMaxAttempts = retryMaxAttempts
}
+
c.SnapshotPath = SnapshotPathDefault
+ if isFileRightful(snapshotPath) {
+ c.SnapshotPath = snapshotPath
+ }
+
c.ReplayOnJoin = ReplayOnJoinDefault
serfConf.QueryResponseSizeLimit = c.QueryResponseSizeLimit
--
Gitblit v1.8.0