zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-05 16:57:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactored off checking config dir

Browse Source
This commit is contained in:
0xdcarns
2021-10-28 16:59:16 -04:00
parent a51d145e5e
commit cc7fef0ed3
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
serverctl/serverctl.go
View File

@@ -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 { if servernet.DefaultInterface == localnet.Name {
exists = true exists = servernet.NetID
} }
} }
if !exists { if exists != "" {
success, err := RemoveNetwork(localnet) 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)
} }
} }
} }