From 8fec134c09589b1229c84f51fb37add1c4be35cc Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期三, 13 五月 2020 17:06:56 +0800
Subject: [PATCH] fix serfSnapShot create path
---
/dev/null | 4 ----
sync.go | 8 ++++----
main.go | 18 +++++++++++++++---
cluster.go | 9 +++++++++
androidSync.aar | 0
5 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/androidSync-sources.jar b/androidSync-sources.jar
deleted file mode 100644
index c681981..0000000
--- a/androidSync-sources.jar
+++ /dev/null
Binary files differ
diff --git a/androidSync.aar b/androidSync.aar
index 2494186..ff68ecf 100644
--- a/androidSync.aar
+++ b/androidSync.aar
Binary files differ
diff --git a/b.bat b/b.bat
deleted file mode 100644
index 16a956c..0000000
--- a/b.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-gomobile bind -target=android androidSync
-cp androidSync.aar E:\workspace\Security_yuyin_indoor\app\libs\
-cp androidSync.aar E:\workspace\Security_yuyin_outdoor_white\app\libs\
-pause
\ No newline at end of file
diff --git a/cluster.go b/cluster.go
index ee96790..d7e308a 100644
--- a/cluster.go
+++ b/cluster.go
@@ -108,4 +108,13 @@
return nil
}
return strNodes
+}
+func GetClusters(key string) []byte {
+ clusters := sdb.CreateSearchNodeWhitClose(key, 2*time.Second);
+ clustersJson, err := json.Marshal(clusters)
+ if err != nil {
+ logger.Error("json.Marshal:", err)
+ return nil
+ }
+ return clustersJson;
}
\ No newline at end of file
diff --git a/main.go b/main.go
index ffab338..df24ac6 100644
--- a/main.go
+++ b/main.go
@@ -1,20 +1,32 @@
//package main
package androidSync
+
import (
+ sdb "basic.com/Android/syncdb.git"
"fmt"
"time"
)
+
func main() {
Leave()
InitCluster()
+ clusters := GetClusters("bjbasic123"+"123455")
+ fmt.Println(string(clusters))
+ clusters1, _ := sdb.CreateSearchNode("bjbasic123"+"123455")
+ fmt.Println(clusters1)
+ if 1==1 {
+ return;
+ }
+ Leave()
+ InitCluster()
InitAgent("node2")
- SyncInit("c4d03d5d-64c3-4941-bb53-152277a3271f","123456","node2","")
+ SyncInit("c4d03d5d-64c3-4941-bb53-152277a3271a","123455","node2","", "")
//JoinByNodeAddrs("192.168.222.103:30190")
- JoinByNodeAddrs("192.168.5.22:30190")
- fmt.Println("hello")
+ //JoinByNodeAddrs("192.168.5.22:30190")
+ fmt.Println("hello1")
var count = 0
for {
//SyncSql("select * from table1 count="+strconv.Itoa(count))
diff --git a/sync.go b/sync.go
index 438a3cb..3f25454 100755
--- a/sync.go
+++ b/sync.go
@@ -46,7 +46,7 @@
return true
}
-func SyncInit(clusterID string, password string, nodeID string, strAddrs string) bool {
+func SyncInit(clusterID string, password string, nodeID string, strAddrs string, snapshotPath string) bool {
var ips []string
if strAddrs == "" {
ips = nil
@@ -56,7 +56,7 @@
pwdFull := syncClusterKeyPrefix + password
- agent, _ = sdb.Init(clusterID, pwdFull, nodeID, ips)
+ agent, _ = sdb.Init(clusterID, pwdFull, nodeID, ips, snapshotPath)
if agent == nil {
logger.Error("sdb.Init")
return false
@@ -80,9 +80,9 @@
return true
}
-func JoinCluster(clusterID, password, strAddrs, devID, devIP, devName string) bool {
+func JoinCluster(clusterID, password, strAddrs, devID, devIP, devName string, snapshotPath string) bool {
- isOk := SyncInit(clusterID, password, devID, strAddrs)
+ isOk := SyncInit(clusterID, password, devID, strAddrs,snapshotPath)
if isOk {
logger.Debug("dbSync.Init success")
--
Gitblit v1.8.0