From aea48291949e54554f5c484cca32a1d3119d8e76 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期一, 07 六月 2021 15:06:34 +0800
Subject: [PATCH] add rpc
---
config.go | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/config.go b/config.go
index 81b019b..855d299 100644
--- a/config.go
+++ b/config.go
@@ -17,6 +17,7 @@
package syncdb
import (
+ "context"
"fmt"
"net"
"os"
@@ -50,8 +51,6 @@
ReplayOnJoinDefault = false
SnapshotPathDefault = "./serfSnapShot"
MaxEventBufferCount = 2048
-
- TcpTransportPort = 30194 //tcp浼犺緭澶ф暟鎹噺鎺ュ彛
)
// DefaultConfig default config
@@ -69,18 +68,44 @@
}
}
+func (c *Config) MergeConf(s *Config) {
+ if s != nil {
+ if s.Ctx != nil {
+ c.Ctx = s.Ctx
+ } else {
+ c.Ctx = context.Background()
+ }
+ c.BindAddr = s.BindAddr
+ c.RPCAddr = s.RPCAddr
+ c.RPCPort = s.RPCPort
+ //serf蹇収鍦板潃
+ if s.SnapshotPath != "" {
+ c.SnapshotPath = s.SnapshotPath
+ }
+ if s.EncryptKey != "" {
+ //鎶ユ枃鍔犲瘑鐨刱ey
+ c.EncryptKey = s.EncryptKey
+ }
+ if s.RPCAuthKey != "" {
+ //RPC璁よ瘉鐨刱ey
+ c.RPCAuthKey = s.RPCAuthKey
+ }
+ }
+}
+
// Config struct
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:"-"`
+ Ctx context.Context
}
// readConfigFile reads configuration from config file
--
Gitblit v1.8.0