Browse Source

removed ". "

Christopher Blaha 3 years ago
parent
commit
4a5ae8fb31
2 changed files with 9 additions and 9 deletions
  1. 7 7
      netclient/functions/common.go
  2. 2 2
      netclient/functions/localport.go

+ 7 - 7
netclient/functions/common.go

@@ -166,19 +166,19 @@ func LeaveNetwork(network string) error {
 	if node.IsServer != "yes" {
 	if node.IsServer != "yes" {
 		token, err := Authenticate(cfg)
 		token, err := Authenticate(cfg)
 		if err != nil {
 		if err != nil {
-			logger.Log(0, "Network: ", cfg.Network, ". Interface: ", cfg.Node.Interface, ". Unable to authenticate: "+err.Error())
+			logger.Log(0, "Network: ", cfg.Network, "Unable to authenticate: "+err.Error())
 		} else {
 		} else {
 			url := "https://" + cfg.Server.API + "/api/nodes/" + cfg.Network + "/" + cfg.Node.ID
 			url := "https://" + cfg.Server.API + "/api/nodes/" + cfg.Network + "/" + cfg.Node.ID
 			response, err := API("", http.MethodDelete, url, token)
 			response, err := API("", http.MethodDelete, url, token)
 			if err != nil {
 			if err != nil {
-				logger.Log(0, "Network: ", cfg.Network, ". Interface: ", cfg.Node.Interface, ". Error deleting node on server: "+err.Error())
+				logger.Log(0, "Network: ", cfg.Network, "Error deleting node on server: "+err.Error())
 			} else {
 			} else {
 				if response.StatusCode == http.StatusOK {
 				if response.StatusCode == http.StatusOK {
-					logger.Log(0, "Network: ", cfg.Network, ". Interface: ", cfg.Node.Interface, ". deleted node", cfg.Node.Name, ".")
+					logger.Log(0, "Network: ", cfg.Network, "deleted node", cfg.Node.Name, ".")
 				} else {
 				} else {
 					bodybytes, _ := io.ReadAll(response.Body)
 					bodybytes, _ := io.ReadAll(response.Body)
 					defer response.Body.Close()
 					defer response.Body.Close()
-					logger.Log(0, fmt.Sprintf("Network: %s. Interface: %s . error deleting node on server %s %s", cfg.Network, cfg.Node.Interface, response.Status, string(bodybytes)))
+					logger.Log(0, fmt.Sprintf("Network: %s error deleting node on server %s %s", cfg.Network, response.Status, string(bodybytes)))
 				}
 				}
 			}
 			}
 		}
 		}
@@ -232,7 +232,7 @@ func WipeLocal(network string) error {
 	ifacename := nodecfg.Interface
 	ifacename := nodecfg.Interface
 	if ifacename != "" {
 	if ifacename != "" {
 		if err = wireguard.RemoveConf(ifacename, true); err == nil {
 		if err = wireguard.RemoveConf(ifacename, true); err == nil {
-			logger.Log(1, "Network: ", nodecfg.Network, " removed WireGuard interface: ", ifacename)
+			logger.Log(1, "Network: ", nodecfg.Network, "removed WireGuard interface: ", ifacename)
 		} else if strings.Contains(err.Error(), "does not exist") {
 		} else if strings.Contains(err.Error(), "does not exist") {
 			err = nil
 			err = nil
 		}
 		}
@@ -398,8 +398,8 @@ func SetServerInfo(cfg *config.ClientConfig) error {
 
 
 func informPortChange(node *models.Node) {
 func informPortChange(node *models.Node) {
 	if node.ListenPort == 0 {
 	if node.ListenPort == 0 {
-		logger.Log(0, "Network: ", node.Network, ". Interface: ", node.Interface, ". UDP hole punching enabled for node", node.Name)
+		logger.Log(0, "Network: ", node.Network, "UDP hole punching enabled for node", node.Name)
 	} else {
 	} else {
-		logger.Log(0, "Network: ", node.Network, ". Interface: ", node.Interface, "node", node.Name, "is using port", strconv.Itoa(int(node.ListenPort)))
+		logger.Log(0, "Network: ", node.Network, "node", node.Name, "is using port", strconv.Itoa(int(node.ListenPort)))
 	}
 	}
 }
 }

+ 2 - 2
netclient/functions/localport.go

@@ -35,9 +35,9 @@ func UpdateLocalListenPort(nodeCfg *config.ClientConfig) error {
 	ifacename := getRealIface(nodeCfg.Node.Interface, nodeCfg.Node.Address)
 	ifacename := getRealIface(nodeCfg.Node.Interface, nodeCfg.Node.Address)
 	localPort, err := GetLocalListenPort(ifacename)
 	localPort, err := GetLocalListenPort(ifacename)
 	if err != nil {
 	if err != nil {
-		logger.Log(1, "Network: ", nodeCfg.Node.Network, ". ", "error encountered checking local listen port: ", ifacename, err.Error())
+		logger.Log(1, "Network: ", nodeCfg.Node.Network, "error encountered checking local listen port: ", ifacename, err.Error())
 	} else if nodeCfg.Node.LocalListenPort != localPort && localPort != 0 {
 	} else if nodeCfg.Node.LocalListenPort != localPort && localPort != 0 {
-		logger.Log(1, "Network: ", nodeCfg.Node.Network, ". ", "Interface: ", ifacename, ". local port has changed from ", strconv.Itoa(int(nodeCfg.Node.LocalListenPort)), " to ", strconv.Itoa(int(localPort)))
+		logger.Log(1, "Network: ", nodeCfg.Node.Network, "local port has changed from ", strconv.Itoa(int(nodeCfg.Node.LocalListenPort)), " to ", strconv.Itoa(int(localPort)))
 		nodeCfg.Node.LocalListenPort = localPort
 		nodeCfg.Node.LocalListenPort = localPort
 		err = config.ModNodeConfig(&nodeCfg.Node)
 		err = config.ModNodeConfig(&nodeCfg.Node)
 		if err != nil {
 		if err != nil {