Browse Source

modified logging

0xdcarns 3 years ago
parent
commit
d14573169b
3 changed files with 6 additions and 6 deletions
  1. 2 2
      logic/networks.go
  2. 2 4
      logic/wireguard.go
  3. 2 0
      netclient/wireguard/common.go

+ 2 - 2
logic/networks.go

@@ -424,12 +424,12 @@ func deleteInterface(ifacename string, postdown string) error {
 		ipExec, errN := exec.LookPath("ip")
 		err = errN
 		if err != nil {
-			ncutils.PrintLog(err.Error(), 1)
+			Log(err.Error(), 1)
 		}
 		_, err = ncutils.RunCmd(ipExec+" link del "+ifacename, false)
 		if postdown != "" {
 			runcmds := strings.Split(postdown, "; ")
-			err = ncutils.RunCmds(runcmds, true)
+			err = ncutils.RunCmds(runcmds, false)
 		}
 	}
 	return err

+ 2 - 4
logic/wireguard.go

@@ -99,8 +99,7 @@ func initWireguard(node *models.Node, privkey string, peers []wgtypes.PeerConfig
 	}
 
 	nodeport := int(node.ListenPort)
-	var conf wgtypes.Config
-	conf = wgtypes.Config{
+	var conf = wgtypes.Config{
 		PrivateKey:   &key,
 		ListenPort:   &nodeport,
 		ReplacePeers: true,
@@ -118,8 +117,7 @@ func initWireguard(node *models.Node, privkey string, peers []wgtypes.PeerConfig
 			return err
 		}
 		// spin up userspace + apply the conf file
-		var deviceiface string
-		deviceiface = ifacename
+		var deviceiface = ifacename
 		d, _ := wgclient.Device(deviceiface)
 		for d != nil && d.Name == deviceiface {
 			_ = RemoveConf(ifacename, false) // remove interface first

+ 2 - 0
netclient/wireguard/common.go

@@ -107,10 +107,12 @@ func InitWireguard(node *models.Node, privkey string, peers []wgtypes.PeerConfig
 	if err != nil {
 		return err
 	}
+
 	modcfg, err := config.ReadConfig(node.Network)
 	if err != nil {
 		return err
 	}
+
 	nodecfg := modcfg.Node
 	servercfg := modcfg.Server