diff --git a/netclient/command/commands.go b/netclient/command/commands.go index 1d3524e4..b8246036 100644 --- a/netclient/command/commands.go +++ b/netclient/command/commands.go @@ -43,7 +43,7 @@ func Join(cfg *config.ClientConfig, privateKey string) error { } return err } - logger.Log(1, "joined ", cfg.Network) + logger.Log(1, "joined", cfg.Network) return err } @@ -85,7 +85,7 @@ func Pull(cfg *config.ClientConfig) error { _, err = functions.Pull(network, true) if err != nil { - logger.Log(1, "Error pulling network config for network: ", network, "\n", err.Error()) + logger.Log(1, "error pulling network config for network: ", network, "\n", err.Error()) } else { logger.Log(1, "pulled network config for "+network) } @@ -113,7 +113,7 @@ func Pull(cfg *config.ClientConfig) error { daemon.Restart() } } - logger.Log(1, "reset network", cfg.Network, " and peer configs") + logger.Log(1, "reset network", cfg.Network, "and peer configs") return err } diff --git a/netclient/functions/common.go b/netclient/functions/common.go index 51f607cf..c1a05e8d 100644 --- a/netclient/functions/common.go +++ b/netclient/functions/common.go @@ -134,7 +134,7 @@ func Uninstall() error { for _, network := range networks { err = LeaveNetwork(network) if err != nil { - logger.Log(1, "Encounter issue leaving network ", network, ": ", err.Error()) + logger.Log(1, "encounter issue leaving network", network, ":", err.Error()) } } } @@ -166,19 +166,19 @@ func LeaveNetwork(network string) error { if node.IsServer != "yes" { token, err := Authenticate(cfg) if err != nil { - logger.Log(0, "Network: ", cfg.Network, "Unable to authenticate: "+err.Error()) + logger.Log(0, "network:", cfg.Network, "Unable to authenticate: "+err.Error()) } else { url := "https://" + cfg.Server.API + "/api/nodes/" + cfg.Network + "/" + cfg.Node.ID response, err := API("", http.MethodDelete, url, token) if err != nil { - logger.Log(0, "Network: ", cfg.Network, "Error deleting node on server: "+err.Error()) + logger.Log(0, "network:", cfg.Network, "Error deleting node on server: "+err.Error()) } else { if response.StatusCode == http.StatusOK { - logger.Log(0, "Network: ", cfg.Network, "deleted node", cfg.Node.Name, ".") + logger.Log(0, "network:", cfg.Network, "deleted node", cfg.Node.Name, ".") } else { bodybytes, _ := io.ReadAll(response.Body) defer response.Body.Close() - logger.Log(0, fmt.Sprintf("Network: %s error deleting node on server %s %s", cfg.Network, response.Status, string(bodybytes))) + logger.Log(0, fmt.Sprintf("network: %s error deleting node on server %s %s", cfg.Network, response.Status, string(bodybytes))) } } } @@ -203,15 +203,15 @@ func LeaveNetwork(network string) error { local.RemoveCIDRRoute(removeIface, queryAddr, cidr) } } else { - logger.Log(1, "Could not flush peer routes when leaving network, ", cfg.Node.Network) + logger.Log(1, "could not flush peer routes when leaving network,", cfg.Node.Network) } } err = WipeLocal(node.Network) if err != nil { - logger.Log(1, "Network: ", node.Network, " unable to wipe local config") + logger.Log(1, "network:", node.Network, "unable to wipe local config") } else { - logger.Log(1, "removed ", node.Network, " network locally") + logger.Log(1, "removed", node.Network, "network locally") } return daemon.Restart() @@ -232,7 +232,7 @@ func WipeLocal(network string) error { ifacename := nodecfg.Interface if ifacename != "" { 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") { err = nil } @@ -398,8 +398,8 @@ func SetServerInfo(cfg *config.ClientConfig) error { func informPortChange(node *models.Node) { if node.ListenPort == 0 { - logger.Log(0, "Network: ", node.Network, "UDP hole punching enabled for node", node.Name) + logger.Log(0, "network:", node.Network, "UDP hole punching enabled for node", node.Name) } else { - logger.Log(0, "Network: ", node.Network, "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))) } } diff --git a/netclient/functions/daemon.go b/netclient/functions/daemon.go index 319f5eea..cdfc102d 100644 --- a/netclient/functions/daemon.go +++ b/netclient/functions/daemon.go @@ -110,19 +110,19 @@ func startGoRoutines(wg *sync.WaitGroup) context.CancelFunc { // UpdateKeys -- updates private key and returns new publickey func UpdateKeys(nodeCfg *config.ClientConfig, client mqtt.Client) error { - logger.Log(0, "Interface: ", nodeCfg.Node.Interface, "received message to update wireguard keys for network ", nodeCfg.Network) + logger.Log(0, "interface:", nodeCfg.Node.Interface, "received message to update wireguard keys for network ", nodeCfg.Network) key, err := wgtypes.GeneratePrivateKey() if err != nil { - logger.Log(0, "Network: ", nodeCfg.Node.Network, "error generating privatekey ", err.Error()) + logger.Log(0, "network:", nodeCfg.Node.Network, "error generating privatekey ", err.Error()) return err } file := ncutils.GetNetclientPathSpecific() + nodeCfg.Node.Interface + ".conf" if err := wireguard.UpdatePrivateKey(file, key.String()); err != nil { - logger.Log(0, "Network: ", nodeCfg.Node.Network, ". error updating wireguard key ", err.Error()) + logger.Log(0, "network:", nodeCfg.Node.Network, "error updating wireguard key ", err.Error()) return err } if storeErr := wireguard.StorePrivKey(key.String(), nodeCfg.Network); storeErr != nil { - logger.Log(0, "Network: ", nodeCfg.Network, "failed to save private key", storeErr.Error()) + logger.Log(0, "network:", nodeCfg.Network, "failed to save private key", storeErr.Error()) return storeErr } @@ -138,15 +138,15 @@ func UpdateKeys(nodeCfg *config.ClientConfig, client mqtt.Client) error { func setSubscriptions(client mqtt.Client, nodeCfg *config.ClientConfig) { if token := client.Subscribe(fmt.Sprintf("update/%s/%s", nodeCfg.Node.Network, nodeCfg.Node.ID), 0, mqtt.MessageHandler(NodeUpdate)); token.WaitTimeout(mq.MQ_TIMEOUT*time.Second) && token.Error() != nil { if token.Error() == nil { - logger.Log(0, "Network: ", nodeCfg.Node.Network, ". connection timeout") + logger.Log(0, "network:", nodeCfg.Node.Network, "connection timeout") } else { - logger.Log(0, "Network: ", nodeCfg.Node.Network, ". ", token.Error().Error()) + logger.Log(0, "network:", nodeCfg.Node.Network, token.Error().Error()) } return } logger.Log(3, fmt.Sprintf("subscribed to node updates for node %s update/%s/%s", nodeCfg.Node.Name, nodeCfg.Node.Network, nodeCfg.Node.ID)) if token := client.Subscribe(fmt.Sprintf("peers/%s/%s", nodeCfg.Node.Network, nodeCfg.Node.ID), 0, mqtt.MessageHandler(UpdatePeers)); token.Wait() && token.Error() != nil { - logger.Log(0, "Network: ", nodeCfg.Node.Network, ". ", token.Error().Error()) + logger.Log(0, "network", nodeCfg.Node.Network, token.Error().Error()) return } logger.Log(3, fmt.Sprintf("subscribed to peer updates for node %s peers/%s/%s", nodeCfg.Node.Name, nodeCfg.Node.Network, nodeCfg.Node.ID)) @@ -159,22 +159,22 @@ func unsubscribeNode(client mqtt.Client, nodeCfg *config.ClientConfig) { var ok = true if token := client.Unsubscribe(fmt.Sprintf("update/%s/%s", nodeCfg.Node.Network, nodeCfg.Node.ID)); token.WaitTimeout(mq.MQ_TIMEOUT*time.Second) && token.Error() != nil { if token.Error() == nil { - logger.Log(1, "Network: ", nodeCfg.Node.Network, ". ", "unable to unsubscribe from updates for node ", nodeCfg.Node.Name, "\n", "connection timeout") + logger.Log(1, "network:", nodeCfg.Node.Network, "unable to unsubscribe from updates for node ", nodeCfg.Node.Name, "\n", "connection timeout") } else { - logger.Log(1, "Network: ", nodeCfg.Node.Network, ". ", "unable to unsubscribe from updates for node ", nodeCfg.Node.Name, "\n", token.Error().Error()) + logger.Log(1, "network:", nodeCfg.Node.Network, "unable to unsubscribe from updates for node ", nodeCfg.Node.Name, "\n", token.Error().Error()) } ok = false } if token := client.Unsubscribe(fmt.Sprintf("peers/%s/%s", nodeCfg.Node.Network, nodeCfg.Node.ID)); token.WaitTimeout(mq.MQ_TIMEOUT*time.Second) && token.Error() != nil { if token.Error() == nil { - logger.Log(1, "Network: ", nodeCfg.Node.Network, ". ", "unable to unsubscribe from peer updates for node ", nodeCfg.Node.Name, "\n", "connection timeout") + logger.Log(1, "network:", nodeCfg.Node.Network, "unable to unsubscribe from peer updates for node ", nodeCfg.Node.Name, "\n", "connection timeout") } else { - logger.Log(1, "Network: ", nodeCfg.Node.Network, ". ", "unable to unsubscribe from peer updates for node ", nodeCfg.Node.Name, "\n", token.Error().Error()) + logger.Log(1, "network:", nodeCfg.Node.Network, "unable to unsubscribe from peer updates for node ", nodeCfg.Node.Name, "\n", token.Error().Error()) } ok = false } if ok { - logger.Log(1, "Network: ", nodeCfg.Node.Network, ". ", "successfully unsubscribed node ", nodeCfg.Node.ID, " : ", nodeCfg.Node.Name) + logger.Log(1, "network:", nodeCfg.Node.Network, "successfully unsubscribed node ", nodeCfg.Node.ID, " : ", nodeCfg.Node.Name) } } @@ -182,7 +182,7 @@ func unsubscribeNode(client mqtt.Client, nodeCfg *config.ClientConfig) { // the client should subscribe to ALL nodes that exist on server locally func messageQueue(ctx context.Context, wg *sync.WaitGroup, cfg *config.ClientConfig) { defer wg.Done() - logger.Log(0, "Network: ", cfg.Node.Network, ". ", "netclient message queue started for server: ", cfg.Server.Server) + logger.Log(0, "network:", cfg.Node.Network, "netclient message queue started for server: ", cfg.Server.Server) client, err := setupMQTT(cfg, false) if err != nil { logger.Log(0, "unable to connect to broker", cfg.Server.Server, err.Error()) @@ -259,7 +259,7 @@ func setupMQTT(cfg *config.ClientConfig, publish bool) (mqtt.Client, error) { opts.SetOrderMatters(true) opts.SetResumeSubs(true) opts.SetConnectionLostHandler(func(c mqtt.Client, e error) { - logger.Log(0, "Network: ", cfg.Node.Network, ". ", "detected broker connection lost for", cfg.Server.Server) + logger.Log(0, "network:", cfg.Node.Network, "detected broker connection lost for", cfg.Server.Server) }) client := mqtt.NewClient(opts) var connecterr error diff --git a/netclient/functions/join.go b/netclient/functions/join.go index 5a40578c..1d69fcfd 100644 --- a/netclient/functions/join.go +++ b/netclient/functions/join.go @@ -76,7 +76,7 @@ func JoinNetwork(cfg *config.ClientConfig, privateKey string) error { if err == nil { cfg.Node.LocalAddress = intIP } else { - logger.Log(1, "Network: ", cfg.Network, ". ", "error retrieving private address: ", err.Error()) + logger.Log(1, "network:", cfg.Network, "error retrieving private address: ", err.Error()) } } @@ -88,7 +88,7 @@ func JoinNetwork(cfg *config.ClientConfig, privateKey string) error { cfg.Node.Endpoint, err = ncutils.GetPublicIP() } if err != nil || cfg.Node.Endpoint == "" { - logger.Log(0, "Network: ", cfg.Network, ". ", "Error setting cfg.Node.Endpoint.") + logger.Log(0, "network:", cfg.Network, "error setting cfg.Node.Endpoint.") return err } } @@ -163,13 +163,13 @@ func JoinNetwork(cfg *config.ClientConfig, privateKey string) error { return err } if node.IsPending == "yes" { - logger.Log(0, "Network: ", cfg.Network, ". ", "Node is marked as PENDING.") - logger.Log(0, "Network: ", cfg.Network, ". ", "Awaiting approval from Admin before configuring WireGuard.") + logger.Log(0, "network:", cfg.Network, "node is marked as PENDING.") + logger.Log(0, "network:", cfg.Network, "awaiting approval from Admin before configuring WireGuard.") if cfg.Daemon != "off" { return daemon.InstallDaemon() } } - logger.Log(1, "Network: ", cfg.Node.Network, ". ", "node created on remote server...updating configs") + logger.Log(1, "network:", cfg.Node.Network, "node created on remote server...updating configs") err = ncutils.ModPort(&node) if err != nil { return err @@ -186,7 +186,7 @@ func JoinNetwork(cfg *config.ClientConfig, privateKey string) error { } // attempt to make backup if err = config.SaveBackup(node.Network); err != nil { - logger.Log(0, "Network: ", node.Network, ". ", "failed to make backup, node will not auto restore if config is corrupted") + logger.Log(0, "network:", node.Network, "failed to make backup, node will not auto restore if config is corrupted") } logger.Log(0, "starting wireguard") err = wireguard.InitWireguard(&node, privateKey, nodeGET.Peers[:], false) @@ -202,7 +202,7 @@ func JoinNetwork(cfg *config.ClientConfig, privateKey string) error { } // update server with latest data if err := PublishNodeUpdate(cfg); err != nil { - logger.Log(0, "Network: ", cfg.Network, ". ", "failed to publish update for join", err.Error()) + logger.Log(0, "network:", cfg.Network, "failed to publish update for join", err.Error()) } if cfg.Daemon == "install" || ncutils.IsFreeBSD() { @@ -231,8 +231,8 @@ func formatName(node models.Node) string { node.Name = ncutils.ShortenString(node.Name, models.MAX_NAME_LENGTH) } if !node.NameInNodeCharSet() || len(node.Name) > models.MAX_NAME_LENGTH { - logger.Log(1, "Network: ", node.Network, ". ", "could not properly format name: "+node.Name) - logger.Log(1, "Network: ", node.Network, ". ", "setting name to blank") + logger.Log(1, "network:", node.Network, "could not properly format name: "+node.Name) + logger.Log(1, "network:", node.Network, "setting name to blank") node.Name = "" } return node.Name diff --git a/netclient/functions/localport.go b/netclient/functions/localport.go index 1a8f36c7..d6290534 100644 --- a/netclient/functions/localport.go +++ b/netclient/functions/localport.go @@ -35,9 +35,9 @@ func UpdateLocalListenPort(nodeCfg *config.ClientConfig) error { ifacename := getRealIface(nodeCfg.Node.Interface, nodeCfg.Node.Address) localPort, err := GetLocalListenPort(ifacename) 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 { - logger.Log(1, "Network: ", nodeCfg.Node.Network, "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 err = config.ModNodeConfig(&nodeCfg.Node) if err != nil { diff --git a/netclient/functions/localport_freebsd.go b/netclient/functions/localport_freebsd.go index cccaf471..c69149fc 100644 --- a/netclient/functions/localport_freebsd.go +++ b/netclient/functions/localport_freebsd.go @@ -34,16 +34,16 @@ func UpdateLocalListenPort(nodeCfg *config.ClientConfig) error { var err error localPort, err := GetLocalListenPort(nodeCfg.Node.Interface) if err != nil { - logger.Log(1, "Network: ", nodeCfg.Node.Network, ". ", "error encountered checking local listen port for interface : ", nodeCfg.Node.Interface, err.Error()) + logger.Log(1, "network:", nodeCfg.Node.Network, "error encountered checking local listen port for interface : ", nodeCfg.Node.Interface, err.Error()) } else if nodeCfg.Node.LocalListenPort != localPort && localPort != 0 { - logger.Log(1, "Network: ", nodeCfg.Node.Network, ". ", "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 err = config.ModNodeConfig(&nodeCfg.Node) if err != nil { return err } if err := PublishNodeUpdate(nodeCfg); err != nil { - logger.Log(0, "Network: ", nodeCfg.Node.Network, ". ", "could not publish local port change") + logger.Log(0, "network:", nodeCfg.Node.Network, "could not publish local port change") } } return err diff --git a/netclient/functions/mqhandlers.go b/netclient/functions/mqhandlers.go index e0948342..8b56fc77 100644 --- a/netclient/functions/mqhandlers.go +++ b/netclient/functions/mqhandlers.go @@ -25,7 +25,7 @@ import ( // All -- mqtt message hander for all ('#') topics var All mqtt.MessageHandler = func(client mqtt.Client, msg mqtt.Message) { logger.Log(0, "default message handler -- received message but not handling") - logger.Log(0, "Topic: "+string(msg.Topic())) + logger.Log(0, "topic: "+string(msg.Topic())) //logger.Log(0, "Message: " + string(msg.Payload())) } @@ -53,7 +53,7 @@ func NodeUpdate(client mqtt.Client, msg mqtt.Message) { return } insert(newNode.Network, lastNodeUpdate, string(data)) // store new message in cache - logger.Log(0, "Network: ", newNode.Network, "received message to update node "+newNode.Name) + logger.Log(0, "network:", newNode.Network, "received message to update node "+newNode.Name) // ensure that OS never changes newNode.OS = runtime.GOOS @@ -66,7 +66,7 @@ func NodeUpdate(client mqtt.Client, msg mqtt.Message) { nodeCfg.Node = newNode switch newNode.Action { case models.NODE_DELETE: - logger.Log(0, "Network: ", nodeCfg.Node.Network, " received delete request for %s", nodeCfg.Node.Name) + logger.Log(0, "network:", nodeCfg.Node.Network, " received delete request for %s", nodeCfg.Node.Name) unsubscribeNode(client, &nodeCfg) if err = LeaveNetwork(nodeCfg.Node.Network); err != nil { if !strings.Contains("rpc error", err.Error()) { @@ -74,7 +74,7 @@ func NodeUpdate(client mqtt.Client, msg mqtt.Message) { return } } - logger.Log(0, nodeCfg.Node.Name, " was removed from nework ", nodeCfg.Node.Network) + logger.Log(0, nodeCfg.Node.Name, "was removed from network", nodeCfg.Node.Network) return case models.NODE_UPDATE_KEY: // == get the current key for node == @@ -98,7 +98,7 @@ func NodeUpdate(client mqtt.Client, msg mqtt.Message) { // Save new config nodeCfg.Node.Action = models.NODE_NOOP if err := config.Write(&nodeCfg, nodeCfg.Network); err != nil { - logger.Log(0, nodeCfg.Node.Network, " error updating node configuration: ", err.Error()) + logger.Log(0, nodeCfg.Node.Network, "error updating node configuration: ", err.Error()) } nameserver := nodeCfg.Server.CoreDNSAddr privateKey, err := wireguard.RetrievePrivKey(newNode.Network) @@ -115,7 +115,7 @@ func NodeUpdate(client mqtt.Client, msg mqtt.Message) { } err = ncutils.ModPort(&newNode) if err != nil { - logger.Log(0, "Network: ", nodeCfg.Node.Network, " error modifying node port on", newNode.Name, "-", err.Error()) + logger.Log(0, "network:", nodeCfg.Node.Network, "error modifying node port on", newNode.Name, "-", err.Error()) return } informPortChange(&newNode) @@ -148,23 +148,23 @@ func NodeUpdate(client mqtt.Client, msg mqtt.Message) { // } doneErr := publishSignal(&nodeCfg, ncutils.DONE) if doneErr != nil { - logger.Log(0, "Network: ", nodeCfg.Node.Network, " could not notify server to update peers after interface change") + logger.Log(0, "network:", nodeCfg.Node.Network, "could not notify server to update peers after interface change") } else { - logger.Log(0, "Network: ", nodeCfg.Node.Network, " signalled finished interface update to server") + logger.Log(0, "network:", nodeCfg.Node.Network, "signalled finished interface update to server") } } else if hubChange { doneErr := publishSignal(&nodeCfg, ncutils.DONE) if doneErr != nil { - logger.Log(0, "Network: ", nodeCfg.Node.Network, " could not notify server to update peers after hub change") + logger.Log(0, "network:", nodeCfg.Node.Network, "could not notify server to update peers after hub change") } else { - logger.Log(0, "Network: ", nodeCfg.Node.Network, " signalled finished hub update to server") + logger.Log(0, "network:", nodeCfg.Node.Network, "signalled finished hub update to server") } } //deal with DNS if newNode.DNSOn != "yes" && shouldDNSChange && nodeCfg.Node.Interface != "" { - logger.Log(0, "Network: ", nodeCfg.Node.Network, " settng DNS off") + logger.Log(0, "network:", nodeCfg.Node.Network, "settng DNS off") if err := removeHostDNS(nodeCfg.Node.Interface, ncutils.IsWindows()); err != nil { - logger.Log(0, "Network: ", nodeCfg.Node.Network, " error removing netmaker profile from /etc/hosts "+err.Error()) + logger.Log(0, "network:", nodeCfg.Node.Network, "error removing netmaker profile from /etc/hosts "+err.Error()) } // _, err := ncutils.RunCmd("/usr/bin/resolvectl revert "+nodeCfg.Node.Interface, true) // if err != nil { @@ -229,15 +229,15 @@ func UpdatePeers(client mqtt.Client, msg mqtt.Message) { logger.Log(0, "error syncing wg after peer update: "+err.Error()) return } - logger.Log(0, "Network: ", cfg.Node.Network, " received peer update for node "+cfg.Node.Name+" "+cfg.Node.Network) + logger.Log(0, "network:", cfg.Node.Network, "received peer update for node "+cfg.Node.Name+" "+cfg.Node.Network) if cfg.Node.DNSOn == "yes" { if err := setHostDNS(peerUpdate.DNS, cfg.Node.Interface, ncutils.IsWindows()); err != nil { - logger.Log(0, "Network: ", cfg.Node.Network, " error updating /etc/hosts "+err.Error()) + logger.Log(0, "network:", cfg.Node.Network, "error updating /etc/hosts "+err.Error()) return } } else { if err := removeHostDNS(cfg.Node.Interface, ncutils.IsWindows()); err != nil { - logger.Log(0, "Network: ", cfg.Node.Network, " error removing profile from /etc/hosts "+err.Error()) + logger.Log(0, "network:", cfg.Node.Network, "error removing profile from /etc/hosts "+err.Error()) return } } diff --git a/netclient/functions/mqpublish.go b/netclient/functions/mqpublish.go index 70b9b451..4f90f2ed 100644 --- a/netclient/functions/mqpublish.go +++ b/netclient/functions/mqpublish.go @@ -49,18 +49,18 @@ func checkin() { logger.Log(1, "error encountered checking public ip addresses: ", err.Error()) } if nodeCfg.Node.Endpoint != extIP && extIP != "" { - logger.Log(1, "Network: ", nodeCfg.Node.Network, " endpoint has changed from ", nodeCfg.Node.Endpoint, " to ", extIP) + logger.Log(1, "network:", nodeCfg.Node.Network, "endpoint has changed from ", nodeCfg.Node.Endpoint, " to ", extIP) nodeCfg.Node.Endpoint = extIP if err := PublishNodeUpdate(&nodeCfg); err != nil { - logger.Log(0, "Network: ", nodeCfg.Node.Network, " could not publish endpoint change") + logger.Log(0, "network:", nodeCfg.Node.Network, "could not publish endpoint change") } } intIP, err := getPrivateAddr() if err != nil { - logger.Log(1, "Network: ", nodeCfg.Node.Network, " error encountered checking private ip addresses: ", err.Error()) + logger.Log(1, "network:", nodeCfg.Node.Network, "error encountered checking private ip addresses: ", err.Error()) } if nodeCfg.Node.LocalAddress != intIP && intIP != "" { - logger.Log(1, "Network: ", nodeCfg.Node.Network, " local Address has changed from ", nodeCfg.Node.LocalAddress, " to ", intIP) + logger.Log(1, "network:", nodeCfg.Node.Network, "local Address has changed from ", nodeCfg.Node.LocalAddress, " to ", intIP) nodeCfg.Node.LocalAddress = intIP if err := PublishNodeUpdate(&nodeCfg); err != nil { logger.Log(0, "Network: ", nodeCfg.Node.Network, " could not publish local address change") @@ -71,13 +71,13 @@ func checkin() { } else if nodeCfg.Node.IsLocal == "yes" && nodeCfg.Node.LocalRange != "" { localIP, err := ncutils.GetLocalIP(nodeCfg.Node.LocalRange) if err != nil { - logger.Log(1, "Network: ", nodeCfg.Node.Network, " error encountered checking local ip addresses: ", err.Error()) + logger.Log(1, "network:", nodeCfg.Node.Network, "error encountered checking local ip addresses: ", err.Error()) } if nodeCfg.Node.Endpoint != localIP && localIP != "" { - logger.Log(1, "Network: ", nodeCfg.Node.Network, " endpoint has changed from "+nodeCfg.Node.Endpoint+" to ", localIP) + logger.Log(1, "network:", nodeCfg.Node.Network, "endpoint has changed from "+nodeCfg.Node.Endpoint+" to ", localIP) nodeCfg.Node.Endpoint = localIP if err := PublishNodeUpdate(&nodeCfg); err != nil { - logger.Log(0, "Network: ", nodeCfg.Node.Network, " could not publish localip change") + logger.Log(0, "network:", nodeCfg.Node.Network, "could not publish localip change") } } } @@ -99,7 +99,7 @@ func PublishNodeUpdate(nodeCfg *config.ClientConfig) error { return err } - logger.Log(0, "Network: ", nodeCfg.Node.Network, " sent a node update to server for node", nodeCfg.Node.Name, ", ", nodeCfg.Node.ID) + logger.Log(0, "network:", nodeCfg.Node.Network, "sent a node update to server for node", nodeCfg.Node.Name, ", ", nodeCfg.Node.ID) return nil } diff --git a/netclient/functions/pull.go b/netclient/functions/pull.go index 6c00e010..afe7ac94 100644 --- a/netclient/functions/pull.go +++ b/netclient/functions/pull.go @@ -90,7 +90,7 @@ func Pull(network string, iface bool) (*models.Node, error) { } var bkupErr = config.SaveBackup(network) if bkupErr != nil { - logger.Log(0, "unable to update backup file for ", network) + logger.Log(0, "unable to update backup file for", network) } return &resNode, err diff --git a/netclient/functions/register.go b/netclient/functions/register.go index 719712a2..dff7103b 100644 --- a/netclient/functions/register.go +++ b/netclient/functions/register.go @@ -94,7 +94,7 @@ func RegisterWithServer(private *ed25519.PrivateKey, cfg *config.ClientConfig) e if err := tls.SaveCertToFile(ncutils.GetNetclientServerPath(cfg.Server.Server)+ncutils.GetSeparator(), "client.pem", &resp.Cert); err != nil { return err } - logger.Log(0, "Network: ", cfg.Network, "certificates/key saved ") + logger.Log(0, "network:", cfg.Network, "certificates/key saved ") //join the network defined in the token return nil }