From 294654d95026ec2f9216934abe9ee4a21eac19fc Mon Sep 17 00:00:00 2001
From: afeiszli <alex.feiszli@gmail.com>
Date: Tue, 1 Feb 2022 09:59:23 -0500
Subject: [PATCH] modify syncservernetwork

---
 main.go                 |  4 ++++
 servercfg/serverconf.go |  2 +-
 serverctl/serverctl.go  | 16 ++++++++++++----
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/main.go b/main.go
index b82bf5ec..0e3b9f71 100644
--- a/main.go
+++ b/main.go
@@ -39,6 +39,10 @@ func main() {
 func initialize() { // Client Mode Prereq Check
 	var err error
 
+	if servercfg.GetNodeID() == "" {
+		logger.FatalLog("error: must set NODE_ID, currently blank")
+	}
+
 	if err = database.InitializeDatabase(); err != nil {
 		logger.FatalLog("Error connecting to database")
 	}
diff --git a/servercfg/serverconf.go b/servercfg/serverconf.go
index e80626fa..6db95ff9 100644
--- a/servercfg/serverconf.go
+++ b/servercfg/serverconf.go
@@ -538,7 +538,7 @@ func IsHostNetwork() bool {
 // GetNodeID - gets the node id
 func GetNodeID() string {
 	var id string
-	id = getMacAddr()
+	// id = getMacAddr()
 	if os.Getenv("NODE_ID") != "" {
 		id = os.Getenv("NODE_ID")
 	} else if config.Config.Server.NodeID != "" {
diff --git a/serverctl/serverctl.go b/serverctl/serverctl.go
index acbd7400..e96eaf0c 100644
--- a/serverctl/serverctl.go
+++ b/serverctl/serverctl.go
@@ -36,14 +36,22 @@ func SyncServerNetwork(network string) error {
 	if err != nil {
 		return err
 	}
-	exists := false
+
+	ifaceExists := false
 	for _, localnet := range localnets {
 		if serverNetworkSettings.DefaultInterface == localnet.Name {
-			exists = true
+			ifaceExists = true
 		}
 	}
-	// add networks locally that exist in database
-	if !exists {
+
+	serverNodeID, err := logic.GetNetworkServerNodeID(network)
+	if !ifaceExists && (err == nil && serverNodeID != "") {
+		serverNode, err := logic.GetNodeByID(serverNodeID)
+		if err != nil {
+			return err
+		}
+		return logic.ServerUpdate(&serverNode, true)
+	} else if !ifaceExists {
 		err := logic.ServerJoin(&serverNetworkSettings)
 		if err != nil {
 			if err == nil {