From 1de2989b844a9695cefd6294d77978095db7bddb Mon Sep 17 00:00:00 2001
From: "Matthew R. Kasun" <mkasun@nusak.ca>
Date: Fri, 30 Sep 2022 15:16:13 -0400
Subject: [PATCH] move logic to serverctl.setNetworkDefaults()

---
 main.go                | 33 ---------------------------------
 serverctl/serverctl.go | 29 ++++++++++++++++++++++++++---
 2 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/main.go b/main.go
index 1769dc60..a82a07f8 100644
--- a/main.go
+++ b/main.go
@@ -12,7 +12,6 @@ import (
 	"os/signal"
 	"runtime/debug"
 	"strconv"
-	"strings"
 	"sync"
 	"syscall"
 	"time"
@@ -75,38 +74,6 @@ func initialize() { // Client Mode Prereq Check
 	if err = database.InitializeDatabase(); err != nil {
 		logger.FatalLog("Error connecting to database")
 	}
-	//update network defaults
-	networks, _ := logic.GetNetworks()
-	for _, network := range networks {
-		update := false
-		newNet := network
-		newNet.SetDefaults()
-		if strings.Contains(network.NetID, ".") {
-			newNet.NetID = strings.ReplaceAll(network.NetID, ".", "")
-			newNet.DefaultInterface = strings.ReplaceAll(network.DefaultInterface, ".", "")
-			update = true
-		}
-		if strings.ContainsAny(network.NetID, "ABCDEFGHIJKLMNOPQRSTUVWXYZ") {
-			newNet.NetID = strings.ToLower(network.NetID)
-			newNet.DefaultInterface = strings.ToLower(network.DefaultInterface)
-			update = true
-		}
-		if update {
-			newNet.SetDefaults()
-			if err := logic.SaveNetwork(&newNet); err != nil {
-				logger.Log(0, "error saving networks during initial update:", err.Error())
-			}
-			if err := logic.DeleteNetwork(network.NetID); err != nil {
-				logger.Log(0, "error deleting old network:", err.Error())
-			}
-		} else {
-			network.SetDefaults()
-			if err := logic.SaveNetwork(&network); err != nil {
-				logger.Log(0, "error saving networks during with defaults:", err.Error())
-			}
-		}
-	}
-
 	logger.Log(0, "database successfully connected")
 	if err = logic.AddServerIDIfNotPresent(); err != nil {
 		logger.Log(1, "failed to save server ID")
diff --git a/serverctl/serverctl.go b/serverctl/serverctl.go
index 2be0d88a..10613926 100644
--- a/serverctl/serverctl.go
+++ b/serverctl/serverctl.go
@@ -132,9 +132,32 @@ func setNetworkDefaults() error {
 			logger.Log(0, "could not initialize NetworkUsers on network", net.NetID)
 		}
 		pro.AddProNetDefaults(&net)
-		_, _, _, _, _, _, err = logic.UpdateNetwork(&net, &net)
-		if err != nil {
-			logger.Log(0, "could not set defaults on network", net.NetID)
+		update := false
+		newNet := net
+		if strings.Contains(net.NetID, ".") {
+			newNet.NetID = strings.ReplaceAll(net.NetID, ".", "")
+			newNet.DefaultInterface = strings.ReplaceAll(net.DefaultInterface, ".", "")
+			update = true
+		}
+		if strings.ContainsAny(net.NetID, "ABCDEFGHIJKLMNOPQRSTUVWXYZ") {
+			newNet.NetID = strings.ToLower(net.NetID)
+			newNet.DefaultInterface = strings.ToLower(net.DefaultInterface)
+			update = true
+		}
+		if update {
+			newNet.SetDefaults()
+			if err := logic.SaveNetwork(&newNet); err != nil {
+				logger.Log(0, "error saving networks during initial update:", err.Error())
+			}
+			if err := logic.DeleteNetwork(net.NetID); err != nil {
+				logger.Log(0, "error deleting old network:", err.Error())
+			}
+		} else {
+			net.SetDefaults()
+			_, _, _, _, _, _, err = logic.UpdateNetwork(&net, &net)
+			if err != nil {
+				logger.Log(0, "could not set defaults on network", net.NetID)
+			}
 		}
 	}
 	return nil