浏览代码

err nil check

0xdcarns 4 年之前
父节点
当前提交
3b58aa5cec
共有 1 个文件被更改,包括 10 次插入2 次删除
  1. 10 2
      serverctl/serverctl.go

+ 10 - 2
serverctl/serverctl.go

@@ -100,10 +100,18 @@ func HandleContainedClient() error {
 		}
 		log.SetFlags(log.Flags() &^ (log.Llongfile | log.Lshortfile))
 		err := SyncNetworks(servernets)
-		logic.Log("error syncing networks: "+err.Error(), 1)
+		if err != nil {
+			logic.Log("error syncing networks: "+err.Error(), 1)
+		}
 		for _, serverNet := range servernets {
 			err = logic.ServerCheckin(servercfg.GetNodeID(), serverNet.NetID)
-			logic.Log("error occurred during server checkin: "+err.Error(), 1)
+			if err != nil {
+				logic.Log("error occurred during server checkin, running a pull: "+err.Error(), 1)
+				_, err = logic.ServerPull(servercfg.GetNodeID(), serverNet.NetID)
+				if err != nil {
+					logic.Log("error when pulling after checkin: "+err.Error(), 1)
+				}
+			}
 		}
 		logic.Log("completed a checkin call", 3)
 	}