Browse Source

Merge pull request #813 from gravitl/feature_v0.11.0_leavecomms

Feature v0.11.0 leavecomms
Alex Feiszli 3 years ago
parent
commit
b803daa3c2
2 changed files with 9 additions and 2 deletions
  1. 7 0
      netclient/command/commands.go
  2. 2 2
      serverctl/serverctl.go

+ 7 - 0
netclient/command/commands.go

@@ -95,6 +95,13 @@ func Leave(cfg config.ClientConfig, force bool) error {
 	} else {
 	} else {
 		ncutils.PrintLog("success", 0)
 		ncutils.PrintLog("success", 0)
 	}
 	}
+	nets, err := ncutils.GetSystemNetworks()
+	if err == nil && len(nets) == 1 {
+		if nets[0] == cfg.Node.CommID {
+			ncutils.PrintLog("detected comms as remaining network, removing...", 1)
+			err = functions.LeaveNetwork(nets[0], true)
+		}
+	}
 	return err
 	return err
 }
 }
 
 

+ 2 - 2
serverctl/serverctl.go

@@ -37,9 +37,9 @@ func InitializeCommsNetwork() error {
 		network.DefaultUDPHolePunch = "yes"
 		network.DefaultUDPHolePunch = "yes"
 		network.IsComms = "yes"
 		network.IsComms = "yes"
 		return logic.CreateNetwork(network)
 		return logic.CreateNetwork(network)
-	} else {
-		SyncServerNetwork(COMMS_NETID)
 	}
 	}
+	SyncServerNetwork(COMMS_NETID)
+
 	return nil
 	return nil
 }
 }