From 63645d248c765244488cd34dbc1bb6528ca6b7c7 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期二, 05 九月 2023 09:58:13 +0800
Subject: [PATCH] 修复编译
---
system-service/controllers/SyncSWFSNodeController.go | 164 +++++++++++++++++++++++++++---------------------------
1 files changed, 82 insertions(+), 82 deletions(-)
diff --git a/system-service/controllers/SyncSWFSNodeController.go b/system-service/controllers/SyncSWFSNodeController.go
index dd54242..1006836 100644
--- a/system-service/controllers/SyncSWFSNodeController.go
+++ b/system-service/controllers/SyncSWFSNodeController.go
@@ -1,82 +1,82 @@
-package controllers
-
-import (
- "fmt"
- "time"
- "vamicro/config"
- "vamicro/system-service/sys"
- "vamicro/system-service/util"
-
- "basic.com/valib/bhomeclient.git"
- "basic.com/valib/logger.git"
-)
-
-type WeedInfo struct {
- ScriptPath string `json:"scriptPath"`
- Peers []string `json:"peers"`
- DefaultReplication string `json:"defaultReplication"`
-}
-
-type SyncSWFSNodeController struct{}
-
-func (ssn *SyncSWFSNodeController) SyncSWFSNode(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply {
- var err error
- var spp WeedInfo
- logger.Debug("SyncSWFSNode start")
- if err = c.BindJSON(&spp); err != nil {
- logger.Error("SyncSWFSNode param error")
- return &bhomeclient.Reply{Msg: "param error"}
- }
-
- ip, _, _ := sys.GetLocalIP(config.Server.NetworkAdapter)
- scriptPath := spp.ScriptPath
- peers := spp.Peers
- defaultReplication := spp.DefaultReplication
- _, err = util.VerifyServer(ip)
- logger.Debugf("SyncSWFSNode req=%v, ip=%v, peers=%v, err=%v", spp, ip, peers, err)
- if err == nil {
- sp := util.StopServer(scriptPath)
- if sp == false {
- logger.Errorf("SyncSWFSNode StopServer, ip=%v, peers=%v", ip, peers)
- return &bhomeclient.Reply{Msg: "stop scriptPath 璺緞閿欒锛�"}
- }
- }
-
- if !util.SetConfig(scriptPath, ip, peers, defaultReplication) {
- logger.Errorf("SyncSWFSNode SetConfig, ip=%v, peers=%v", ip, peers)
- return &bhomeclient.Reply{Msg: "scriptPath 璺緞閿欒锛�"}
- }
- if !util.StartServer(scriptPath) {
- logger.Errorf("SyncSWFSNode StartServer, ip=%v, peers=%v", ip, peers)
- return &bhomeclient.Reply{Msg: "scriptPath 璺緞閿欒锛�"}
- }
-
- time.Sleep(time.Second * 3)
- _, errF := util.VerifyServer(ip)
- logger.Debugf("SyncSWFSNode first time wait 3 sec, errF=%v, ip=%v, peers=%v", errF, ip, peers)
- if errF != nil {
- time.Sleep(time.Second * 3)
- _, errS := util.VerifyServer(ip)
- logger.Debugf("SyncSWFSNode second time wait 3 sec, errS=%v, ip=%v, peers=%v", errS, ip, peers)
- if errS != nil {
- logger.Errorf("SyncSWFSNode 鍚姩瓒呮椂, errS=%v, ip=%v, peers=%v", errS, ip, peers)
- return &bhomeclient.Reply{Msg: "鍚姩瓒呮椂"}
- }
- }
- logger.Debugf("SyncSWFSNode success, ip=%v, peers=%v", ip, peers)
- return &bhomeclient.Reply{Success: true, Msg: fmt.Sprintf("%v: 鑺傜偣鍚屾鎴愬姛", ip)}
-}
-
-func (ssn *SyncSWFSNodeController) GetSWFSPeers(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply {
- var spp WeedInfo
- c.BindJSON(&spp)
- scriptPath := spp.ScriptPath
- configInfo, err := util.GetConfig(scriptPath)
- if err != nil {
- return &bhomeclient.Reply{Msg: "閰嶇疆鏂囦欢璺緞鎴栨枃浠舵牸寮忛敊璇紒锛侊紒"}
- }
- if len(configInfo.Peers) < 1 {
- return &bhomeclient.Reply{Msg: "鐩爣鑺傜偣鏈嶅姟涓嶅瓨鍦�"}
- }
- return &bhomeclient.Reply{Success: true, Data: configInfo.Peers}
-}
+package controllers
+
+import (
+ "fmt"
+ "time"
+ "vamicro/config"
+ "vamicro/system-service/sys"
+ "vamicro/system-service/util"
+
+ "basic.com/valib/bhomeclient.git"
+ "basic.com/valib/logger.git"
+)
+
+type WeedInfo struct {
+ ScriptPath string `json:"scriptPath"`
+ Peers []string `json:"peers"`
+ DefaultReplication string `json:"defaultReplication"`
+}
+
+type SyncSWFSNodeController struct{}
+
+func (ssn *SyncSWFSNodeController) SyncSWFSNode(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply {
+ var err error
+ var spp WeedInfo
+ logger.Debug("SyncSWFSNode start")
+ if err = c.BindJSON(&spp); err != nil {
+ logger.Error("SyncSWFSNode param error")
+ return &bhomeclient.Reply{Msg: "param error"}
+ }
+
+ ip, _, _ := sys.GetLocalIP(config.Server.NetworkAdapter)
+ scriptPath := spp.ScriptPath
+ peers := spp.Peers
+ defaultReplication := spp.DefaultReplication
+ _, err = util.VerifyServer(ip)
+ logger.Debugf("SyncSWFSNode req=%v, ip=%v, peers=%v, err=%v", spp, ip, peers, err)
+ if err == nil {
+ sp := util.StopServer(scriptPath)
+ if sp == false {
+ logger.Errorf("SyncSWFSNode StopServer, ip=%v, peers=%v", ip, peers)
+ return &bhomeclient.Reply{Msg: "stop scriptPath 璺緞閿欒锛�"}
+ }
+ }
+
+ if !util.SetConfig(scriptPath, ip, peers, defaultReplication) {
+ logger.Errorf("SyncSWFSNode SetConfig, ip=%v, peers=%v", ip, peers)
+ return &bhomeclient.Reply{Msg: "scriptPath 璺緞閿欒锛�"}
+ }
+ if !util.StartServer(scriptPath) {
+ logger.Errorf("SyncSWFSNode StartServer, ip=%v, peers=%v", ip, peers)
+ return &bhomeclient.Reply{Msg: "scriptPath 璺緞閿欒锛�"}
+ }
+
+ time.Sleep(time.Second * 3)
+ _, errF := util.VerifyServer(ip)
+ logger.Debugf("SyncSWFSNode first time wait 3 sec, errF=%v, ip=%v, peers=%v", errF, ip, peers)
+ if errF != nil {
+ time.Sleep(time.Second * 3)
+ _, errS := util.VerifyServer(ip)
+ logger.Debugf("SyncSWFSNode second time wait 3 sec, errS=%v, ip=%v, peers=%v", errS, ip, peers)
+ if errS != nil {
+ logger.Errorf("SyncSWFSNode 鍚姩瓒呮椂, errS=%v, ip=%v, peers=%v", errS, ip, peers)
+ return &bhomeclient.Reply{Msg: "鍚姩瓒呮椂"}
+ }
+ }
+ logger.Debugf("SyncSWFSNode success, ip=%v, peers=%v", ip, peers)
+ return &bhomeclient.Reply{Success: true, Msg: fmt.Sprintf("%v: 鑺傜偣鍚屾鎴愬姛", ip)}
+}
+
+func (ssn *SyncSWFSNodeController) GetSWFSPeers(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply {
+ var spp WeedInfo
+ c.BindJSON(&spp)
+ scriptPath := spp.ScriptPath
+ configInfo, err := util.GetConfig(scriptPath)
+ if err != nil {
+ return &bhomeclient.Reply{Msg: "閰嶇疆鏂囦欢璺緞鎴栨枃浠舵牸寮忛敊璇紒锛侊紒"}
+ }
+ if len(configInfo.Peers) < 1 {
+ return &bhomeclient.Reply{Msg: "鐩爣鑺傜偣鏈嶅姟涓嶅瓨鍦�"}
+ }
+ return &bhomeclient.Reply{Success: true, Data: configInfo.Peers}
+}
--
Gitblit v1.8.0