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

syncnet fix

Browse Source
This commit is contained in:
0xdcarns
2021-10-28 17:29:44 -04:00
parent cc7fef0ed3
commit 08e48b76a7
1 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
serverctl/serverctl.go
View File

@@ -99,10 +99,6 @@ func HandleContainedClient() error {
if err != nil { if err != nil {
return err return err
} }
err := SyncNetworks(servernets)
if err != nil {
logic.Log("error syncing networks: "+err.Error(), 1)
}
for _, serverNet := range servernets { for _, serverNet := range servernets {
err = logic.ServerCheckin(servercfg.GetNodeID(), serverNet.NetID) err = logic.ServerCheckin(servercfg.GetNodeID(), serverNet.NetID)
if err != nil { if err != nil {
@@ -111,6 +107,10 @@ func HandleContainedClient() error {
logic.Log("completed peers check of network "+serverNet.NetID, 3) logic.Log("completed peers check of network "+serverNet.NetID, 3)
} }
} }
err := SyncNetworks(servernets)
if err != nil {
logic.Log("error syncing networks: "+err.Error(), 1)
}
// logic.Log("completed a checkin call", 3) // logic.Log("completed a checkin call", 3)
} }
return nil return nil
@@ -147,24 +147,27 @@ func SyncNetworks(servernets []models.Network) error {
} }
// check networks to leave // check networks to leave
for _, localnet := range localnets { for _, localnet := range localnets {
var exists = "" if strings.Contains(localnet.Name, "nm-") {
for _, servernet := range servernets { var exists = ""
if servernet.DefaultInterface == localnet.Name { for _, servernet := range servernets {
exists = servernet.NetID if servernet.DefaultInterface == localnet.Name {
} exists = servernet.NetID
}
if exists != "" {
success, err := RemoveNetwork(exists)
if err != nil || !success {
if err == nil {
err = errors.New("network delete failed for " + exists)
} }
if servercfg.GetVerbose() >= 1 { }
log.Printf("[netmaker] error removing network %s during sync %s \n", exists, err) if exists == "" {
success, err := RemoveNetwork(exists)
if err != nil || !success {
if err == nil {
err = errors.New("network delete failed for " + exists)
}
if servercfg.GetVerbose() >= 1 {
log.Printf("[netmaker] error removing network %s during sync %s \n", exists, err)
}
} }
} }
} }
} }
return nil return nil
} }