Browse Source

refactored off checking config dir

0xdcarns 3 years ago
parent
commit
cc7fef0ed3
1 changed files with 10 additions and 10 deletions
  1. 10 10
      serverctl/serverctl.go

+ 10 - 10
serverctl/serverctl.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"errors"
 	"io"
 	"io"
 	"log"
 	"log"
+	"net"
 	"os"
 	"os"
 	"strings"
 	"strings"
 
 
@@ -98,7 +99,6 @@ func HandleContainedClient() error {
 		if err != nil {
 		if err != nil {
 			return err
 			return err
 		}
 		}
-		log.SetFlags(log.Flags() &^ (log.Llongfile | log.Lshortfile))
 		err := SyncNetworks(servernets)
 		err := SyncNetworks(servernets)
 		if err != nil {
 		if err != nil {
 			logic.Log("error syncing networks: "+err.Error(), 1)
 			logic.Log("error syncing networks: "+err.Error(), 1)
@@ -119,7 +119,7 @@ func HandleContainedClient() error {
 // SyncNetworks - syncs the networks for servers
 // SyncNetworks - syncs the networks for servers
 func SyncNetworks(servernets []models.Network) error {
 func SyncNetworks(servernets []models.Network) error {
 
 
-	localnets, err := ncutils.GetSystemNetworks()
+	localnets, err := net.Interfaces()
 	if err != nil {
 	if err != nil {
 		return err
 		return err
 	}
 	}
@@ -127,7 +127,7 @@ func SyncNetworks(servernets []models.Network) error {
 	for _, servernet := range servernets {
 	for _, servernet := range servernets {
 		exists := false
 		exists := false
 		for _, localnet := range localnets {
 		for _, localnet := range localnets {
-			if servernet.NetID == localnet {
+			if servernet.DefaultInterface == localnet.Name {
 				exists = true
 				exists = true
 			}
 			}
 		}
 		}
@@ -147,20 +147,20 @@ func SyncNetworks(servernets []models.Network) error {
 	}
 	}
 	// check networks to leave
 	// check networks to leave
 	for _, localnet := range localnets {
 	for _, localnet := range localnets {
-		exists := false
+		var exists = ""
 		for _, servernet := range servernets {
 		for _, servernet := range servernets {
-			if servernet.NetID == localnet {
-				exists = true
+			if servernet.DefaultInterface == localnet.Name {
+				exists = servernet.NetID
 			}
 			}
 		}
 		}
-		if !exists {
-			success, err := RemoveNetwork(localnet)
+		if exists != "" {
+			success, err := RemoveNetwork(exists)
 			if err != nil || !success {
 			if err != nil || !success {
 				if err == nil {
 				if err == nil {
-					err = errors.New("network delete failed for " + localnet)
+					err = errors.New("network delete failed for " + exists)
 				}
 				}
 				if servercfg.GetVerbose() >= 1 {
 				if servercfg.GetVerbose() >= 1 {
-					log.Printf("[netmaker] error removing network %s during sync %s \n", localnet, err)
+					log.Printf("[netmaker] error removing network %s during sync %s \n", exists, err)
 				}
 				}
 			}
 			}
 		}
 		}