From 546d23f0ec50be30824d5a58ff5281ff6e21adbb Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期三, 25 十二月 2019 09:15:39 +0800
Subject: [PATCH] a
---
cluster.go | 56 ++++++++++----------------------------------------------
1 files changed, 10 insertions(+), 46 deletions(-)
diff --git a/cluster.go b/cluster.go
index 7a48bb0..ee96790 100644
--- a/cluster.go
+++ b/cluster.go
@@ -1,5 +1,5 @@
package androidSync
-
+//package main
import (
sdb "basic.com/Android/syncdb.git"
"basic.com/valib/logger.git"
@@ -13,7 +13,7 @@
syncClusterKeyPrefix = "bjbasic123"
)
const (
- defaultSqliteDBPath = "./testdb.db"
+ defaultSqliteDBPath = "/sdcard/testdb.db"
dBNameCluster = "cluster"
dBNameClusterNode = "cluster_node"
@@ -26,9 +26,9 @@
var members *memberlist.Memberlist
var sqliteDBPath string = defaultSqliteDBPath
-func init(){
- var logFile = "./logger/androidSync.log"
- var logSaveDays = 15 // 鏃ュ織鍒濆鍖�
+func InitCluster() bool {
+ var logFile = "/sdcard/androidSync.log"
+ var logSaveDays = 15
logger.Config(logFile, logger.DebugLevel)
logger.SetSaveDays(logSaveDays)
err := sdb.InitDbConn(sqliteDBPath)
@@ -36,18 +36,13 @@
logger.Error("sdb.InitDbConn ERROR: sqliteDBPath:", sqliteDBPath)
os.Exit(-1)
}
+ return true
}
-/*
- 璁剧疆鏁版嵁搴撹矾寰�
- */
func setDBPath(path string){
sqliteDBPath = path
}
-/*
- 鑾峰彇鏁版嵁搴撹矾寰�
-*/
func getDBPath() string {
return sqliteDBPath
}
@@ -57,12 +52,6 @@
sdb.CloseSearchNode(ml)
}
-/*
- 鍒涘缓鏌ヨ闆嗙兢鐨勪复鏃惰妭鐐癸紝闇�瑕佷紶鍏ラ泦缇ゅ瘑鐮侊紝6瀛楄妭锛屾暟瀛楁垨瀛楁瘝
- 姣忎釜涓�绉掕皟鐢ㄤ竴娆etSearchNodes锛屾嬁鍒版悳绱㈠埌鐨勮妭鐐逛俊鎭暟鎹�
- 鏈�鍚庤皟鐢–loseSearchNode锛屽叧闂复鏃跺垱寤虹殑鎼滅储鑺傜偣
- pwd = password must six bytes
-*/
func CreateSearchNodeByPwd(pwd string) bool{
pwdFull := syncClusterKeyPrefix + pwd
@@ -78,10 +67,7 @@
return true
}
-/*
- 鍒涘缓鏌ヨ闆嗙兢鐨勪复鏃惰妭鐐癸紝闇�瑕佷紶鍏ラ泦缇ゅ瘑鐮侊紝16瀛楄妭
- key = password
-*/
+
func createSearchNode(key string) bool {
var err error
members, err = sdb.CreateSearchNode(key)
@@ -93,11 +79,7 @@
return true
}
-/*
- 闃诲鏂瑰紡鍒涘缓鎼滅储闆嗙兢鐨勮妭鐐癸紝浼氱洿鎺ヨ繑鍥炴悳绱㈠埌鐨勮妭鐐�
- map[string]NodeInfo
- nodes[NodeInfo.NodeID] = NodeInfo
- */
+
func createSearchNodeWhitClose(key string, delay int) []byte {
nodes := sdb.CreateSearchNodeWhitClose(key, time.Duration(delay))
strNodes, err := json.Marshal(nodes)
@@ -108,9 +90,7 @@
return strNodes
}
-/*
- 鍏抽棴涓存椂鍒涘缓鐨勮妭鐐�
-*/
+
func CloseSearchNode() bool {
err := sdb.CloseSearchNode(members)
if err != nil {
@@ -120,22 +100,6 @@
return true
}
-/*
- 鑾峰彇鎼滅储鍒扮殑鑺傜偣淇℃伅
-json vector
-[
-{Node1},
-{Node2},
-...
-{Noden}
-]
-type NodeInfo struct {
- ClusterID string `json:"clusterID"`
- NodeID string `json:"nodeID"`
- NodeAddress string `json:"nodeAddress"`
- IsAlive int `json:"isAlive"` //StatusNone:0, StatusAlive:1, StatusLeaving:2, StatusLeft:3, StatusFailed:4
-}
-*/
func GetSearchNodes() []byte {
nodes := sdb.GetSearchNodes()
strNodes, err := json.Marshal(nodes)
@@ -144,4 +108,4 @@
return nil
}
return strNodes
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0