From 86341ab9e3d7eda30fbb4df2a77b9419a89f97c1 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期五, 02 八月 2019 17:14:27 +0800
Subject: [PATCH] 添加基础业务处理接口
---
config.go | 44 +++++++++++++++++++++++++++++++++++---------
1 files changed, 35 insertions(+), 9 deletions(-)
diff --git a/config.go b/config.go
index 8a25908..f24c38a 100644
--- a/config.go
+++ b/config.go
@@ -14,27 +14,29 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package serf
+package syncdb
import (
"fmt"
+ "net"
"strconv"
- "github.com/apache/servicecomb-service-center/syncer/pkg/utils"
+ //"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"
)
const (
- DefaultBindPort = 30190
- DefaultRPCPort = 30191
+ DefaultBindPort = 5000//30190
+ DefaultRPCPort = 7373//30191
DefaultClusterPort = 30192
ModeSingle = "single"
ModeCluster = "cluster"
retryMaxAttempts = 3
groupExpect = 3
- tagKeyClusterName = "syncer-cluster-name"
+ DefaultEncryptKey = "bjbasic@aiotlink"
+ tagKeyClusterID = "syncer-cluster-name"
TagKeyClusterPort = "syncer-cluster-port"
TagKeyRPCPort = "syncer-rpc-port"
)
@@ -42,6 +44,9 @@
// DefaultConfig default config
func DefaultConfig() *Config {
agentConf := agent.DefaultConfig()
+ agentConf.QueryResponseSizeLimit = 50 * 1024 *1024
+ agentConf.QuerySizeLimit = 50 * 1024 *1024
+ agentConf.UserEventSizeLimit = 1024
agentConf.BindAddr = fmt.Sprintf("0.0.0.0:%d", DefaultBindPort)
agentConf.RPCAddr = fmt.Sprintf("0.0.0.0:%d", DefaultRPCPort)
return &Config{
@@ -58,7 +63,7 @@
Mode string `json:"mode"`
// name to group members into cluster
- ClusterName string `json:"cluster_name"`
+ ClusterID string `json:"cluster_name"`
// port to communicate between cluster members
ClusterPort int `yaml:"cluster_port"`
@@ -77,7 +82,7 @@
func (c *Config) convertToSerf() (*serf.Config, error) {
serfConf := serf.DefaultConfig()
- bindIP, bindPort, err := utils.SplitHostPort(c.BindAddr, DefaultBindPort)
+ bindIP, bindPort, err := SplitHostPort(c.BindAddr, DefaultBindPort)
if err != nil {
return nil, fmt.Errorf("invalid bind address: %s", err)
}
@@ -96,10 +101,11 @@
serfConf.MemberlistConfig.BindAddr = bindIP
serfConf.MemberlistConfig.BindPort = bindPort
serfConf.NodeName = c.NodeName
+
serfConf.Tags = map[string]string{TagKeyRPCPort: strconv.Itoa(c.RPCPort)}
- if c.ClusterName != "" {
- serfConf.Tags[tagKeyClusterName] = c.ClusterName
+ if c.ClusterID != "" {
+ serfConf.Tags[tagKeyClusterID] = c.ClusterID
serfConf.Tags[TagKeyClusterPort] = strconv.Itoa(c.ClusterPort)
}
@@ -108,3 +114,23 @@
}
return serfConf, nil
}
+
+// SplitHostPort returns the parts of the address and port. If the port does not exist, use defaultPort.
+func SplitHostPort(address string, defaultPort int) (string, int, error) {
+ _, _, err := net.SplitHostPort(address)
+ if ae, ok := err.(*net.AddrError); ok && ae.Err == "missing port in address" {
+ address = fmt.Sprintf("%s:%d", address, defaultPort)
+ _, _, err = net.SplitHostPort(address)
+ }
+ if err != nil {
+ return "", 0, err
+ }
+
+ addr, err := net.ResolveTCPAddr("tcp", address)
+ if err != nil {
+ return "", 0, err
+ }
+
+ return addr.IP.String(), addr.Port, nil
+}
+
--
Gitblit v1.8.0