From 8819911f0b5289294fc764aba18544f96358a47c Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期六, 19 九月 2020 10:58:41 +0800
Subject: [PATCH] fix logSql has '
---
config.go | 66 ++++++++++++++++++++++++++++----
1 files changed, 57 insertions(+), 9 deletions(-)
diff --git a/config.go b/config.go
index 91ea106..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 (
@@ -35,18 +37,29 @@
ModeCluster = "cluster"
retryMaxAttempts = 3
groupExpect = 3
- DefaultEncryptKey = "bjbasic@aiotlink"
- tagKeyClusterID = "syncer-cluster-name"
+ DefaultEncryptKey = "bjbasic@aiotlink"
+ tagKeyClusterID = "syncer-cluster-name"
TagKeyClusterPort = "syncer-cluster-port"
TagKeyRPCPort = "syncer-rpc-port"
+ BroadcastIP = "255.255.255.255"
+ BroadcastPort = 30193
+ BroadcastInterval = 5
+ MaxQueryRespSize = 50 * 1024 * 1024
+ MaxQuerySize = 50 * 1024 * 1024
+ MaxUserEventSize = 9 * 1024
+ ReplayOnJoinDefault = false
+ SnapshotPathDefault = "./serfSnapShot"
+ MaxEventBufferCount = 2048
+
+ TcpTransportPort = 30194 //tcp浼犺緭澶ф暟鎹噺鎺ュ彛
)
// DefaultConfig default config
func DefaultConfig() *Config {
agentConf := agent.DefaultConfig()
- agentConf.QueryResponseSizeLimit = 50 * 1024 *1024
- agentConf.QuerySizeLimit = 50 * 1024 *1024
- agentConf.UserEventSizeLimit = 1024
+ agentConf.QueryResponseSizeLimit = MaxQueryRespSize
+ agentConf.QuerySizeLimit = MaxQuerySize
+ agentConf.UserEventSizeLimit = MaxUserEventSize
agentConf.BindAddr = fmt.Sprintf("0.0.0.0:%d", DefaultBindPort)
agentConf.RPCAddr = fmt.Sprintf("0.0.0.0:%d", DefaultRPCPort)
return &Config{
@@ -78,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)
@@ -112,6 +147,20 @@
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
+ serfConf.QuerySizeLimit = c.QuerySizeLimit
+ serfConf.UserEventSizeLimit = c.UserEventSizeLimit
+ serfConf.SnapshotPath = c.SnapshotPath
+ serfConf.EventBuffer = MaxEventBufferCount
+
return serfConf, nil
}
@@ -133,4 +182,3 @@
return addr.IP.String(), addr.Port, nil
}
-
--
Gitblit v1.8.0