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

log stuff

Browse Source
This commit is contained in:
Christopher Blaha
2022-07-22 22:45:29 -04:00
parent 9be779f666
commit cb8958e927
5 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
netclient/command/commands.go
View File

@@ -113,7 +113,7 @@ func Pull(cfg *config.ClientConfig) error {
daemon.Restart() daemon.Restart()
} }
} }
logger.Log(1, "reset network and peer configs") logger.Log(1, "reset network", cfg.Network, " and peer configs")
return err return err
} }

28
netclient/functions/mqhandlers.go
View File

@@ -53,7 +53,7 @@ func NodeUpdate(client mqtt.Client, msg mqtt.Message) {
return return
} }
insert(newNode.Network, lastNodeUpdate, string(data)) // store new message in cache insert(newNode.Network, lastNodeUpdate, string(data)) // store new message in cache
logger.Log(0, "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 // ensure that OS never changes
newNode.OS = runtime.GOOS newNode.OS = runtime.GOOS
@@ -66,7 +66,7 @@ func NodeUpdate(client mqtt.Client, msg mqtt.Message) {
nodeCfg.Node = newNode nodeCfg.Node = newNode
switch newNode.Action { switch newNode.Action {
case models.NODE_DELETE: case models.NODE_DELETE:
logger.Log(0, "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) unsubscribeNode(client, &nodeCfg)
if err = LeaveNetwork(nodeCfg.Node.Network); err != nil { if err = LeaveNetwork(nodeCfg.Node.Network); err != nil {
if !strings.Contains("rpc error", err.Error()) { if !strings.Contains("rpc error", err.Error()) {
@@ -74,7 +74,7 @@ func NodeUpdate(client mqtt.Client, msg mqtt.Message) {
return return
} }
} }
logger.Log(0, nodeCfg.Node.Name, " was removed") logger.Log(0, nodeCfg.Node.Name, " was removed from nework ", nodeCfg.Node.Network)
return return
case models.NODE_UPDATE_KEY: case models.NODE_UPDATE_KEY:
// == get the current key for node == // == get the current key for node ==
@@ -98,7 +98,7 @@ func NodeUpdate(client mqtt.Client, msg mqtt.Message) {
// Save new config // Save new config
nodeCfg.Node.Action = models.NODE_NOOP nodeCfg.Node.Action = models.NODE_NOOP
if err := config.Write(&nodeCfg, nodeCfg.Network); err != nil { if err := config.Write(&nodeCfg, nodeCfg.Network); err != nil {
logger.Log(0, "error updating node configuration: ", err.Error()) logger.Log(0, nodeCfg.Node.Network "error updating node configuration: ", err.Error())
} }
nameserver := nodeCfg.Server.CoreDNSAddr nameserver := nodeCfg.Server.CoreDNSAddr
privateKey, err := wireguard.RetrievePrivKey(newNode.Network) privateKey, err := wireguard.RetrievePrivKey(newNode.Network)
@@ -115,7 +115,7 @@ func NodeUpdate(client mqtt.Client, msg mqtt.Message) {
} }
err = ncutils.ModPort(&newNode) err = ncutils.ModPort(&newNode)
if err != nil { if err != nil {
logger.Log(0, "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 return
} }
informPortChange(&newNode) informPortChange(&newNode)
@@ -148,23 +148,23 @@ func NodeUpdate(client mqtt.Client, msg mqtt.Message) {
// } // }
doneErr := publishSignal(&nodeCfg, ncutils.DONE) doneErr := publishSignal(&nodeCfg, ncutils.DONE)
if doneErr != nil { if doneErr != nil {
logger.Log(0, "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 { } else {
logger.Log(0, "signalled finished interface update to server") logger.Log(0,"Network: ", nodeCfg.Node.Network " signalled finished interface update to server")
} }
} else if hubChange { } else if hubChange {
doneErr := publishSignal(&nodeCfg, ncutils.DONE) doneErr := publishSignal(&nodeCfg, ncutils.DONE)
if doneErr != nil { if doneErr != nil {
logger.Log(0, "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 { } else {
logger.Log(0, "signalled finished hub update to server") logger.Log(0, "Network: ", nodeCfg.Node.Network, " signalled finished hub update to server")
} }
} }
//deal with DNS //deal with DNS
if newNode.DNSOn != "yes" && shouldDNSChange && nodeCfg.Node.Interface != "" { if newNode.DNSOn != "yes" && shouldDNSChange && nodeCfg.Node.Interface != "" {
logger.Log(0, "settng DNS off") logger.Log(0, "Network: ", nodeCfg.Node>network, " settng DNS off")
if err := removeHostDNS(nodeCfg.Node.Interface, ncutils.IsWindows()); err != nil { if err := removeHostDNS(nodeCfg.Node.Interface, ncutils.IsWindows()); err != nil {
logger.Log(0, "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) // _, err := ncutils.RunCmd("/usr/bin/resolvectl revert "+nodeCfg.Node.Interface, true)
// if err != nil { // 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()) logger.Log(0, "error syncing wg after peer update: "+err.Error())
return return
} }
logger.Log(0, "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 cfg.Node.DNSOn == "yes" {
if err := setHostDNS(peerUpdate.DNS, cfg.Node.Interface, ncutils.IsWindows()); err != nil { if err := setHostDNS(peerUpdate.DNS, cfg.Node.Interface, ncutils.IsWindows()); err != nil {
logger.Log(0, "error updating /etc/hosts "+err.Error()) logger.Log(0, "Network: ", cfg.Node.Network, " error updating /etc/hosts "+err.Error())
return return
} }
} else { } else {
if err := removeHostDNS(cfg.Node.Interface, ncutils.IsWindows()); err != nil { if err := removeHostDNS(cfg.Node.Interface, ncutils.IsWindows()); err != nil {
logger.Log(0, "error removing profile from /etc/hosts "+err.Error()) logger.Log(0, "Network: ", cfg.Node.Network, " error removing profile from /etc/hosts "+err.Error())
return return
} }
} }

20
netclient/functions/mqpublish.go
View File

@@ -49,21 +49,21 @@ func checkin() {
logger.Log(1, "error encountered checking public ip addresses: ", err.Error()) logger.Log(1, "error encountered checking public ip addresses: ", err.Error())
} }
if nodeCfg.Node.Endpoint != extIP && extIP != "" { if nodeCfg.Node.Endpoint != extIP && extIP != "" {
logger.Log(1, "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 nodeCfg.Node.Endpoint = extIP
if err := PublishNodeUpdate(&nodeCfg); err != nil { if err := PublishNodeUpdate(&nodeCfg); err != nil {
logger.Log(0, "could not publish endpoint change") logger.Log(0, "Network: ", nodeCfg.Node.Network, " could not publish endpoint change")
} }
} }
intIP, err := getPrivateAddr() intIP, err := getPrivateAddr()
if err != nil { if err != nil {
logger.Log(1, "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 != "" { if nodeCfg.Node.LocalAddress != intIP && intIP != "" {
logger.Log(1, "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 nodeCfg.Node.LocalAddress = intIP
if err := PublishNodeUpdate(&nodeCfg); err != nil { if err := PublishNodeUpdate(&nodeCfg); err != nil {
logger.Log(0, "could not publish local address change") logger.Log(0, "Network: ", nodeCfg.Node.Network, " could not publish local address change")
} }
} }
_ = UpdateLocalListenPort(&nodeCfg) _ = UpdateLocalListenPort(&nodeCfg)
@@ -71,13 +71,13 @@ func checkin() {
} else if nodeCfg.Node.IsLocal == "yes" && nodeCfg.Node.LocalRange != "" { } else if nodeCfg.Node.IsLocal == "yes" && nodeCfg.Node.LocalRange != "" {
localIP, err := ncutils.GetLocalIP(nodeCfg.Node.LocalRange) localIP, err := ncutils.GetLocalIP(nodeCfg.Node.LocalRange)
if err != nil { if err != nil {
logger.Log(1, "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 != "" { if nodeCfg.Node.Endpoint != localIP && localIP != "" {
logger.Log(1, "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 nodeCfg.Node.Endpoint = localIP
if err := PublishNodeUpdate(&nodeCfg); err != nil { if err := PublishNodeUpdate(&nodeCfg); err != nil {
logger.Log(0, "could not publish localip change") logger.Log(0, "Network: ", nodeCfg.Node.Network, " could not publish localip change")
} }
} }
} }
@@ -99,14 +99,14 @@ func PublishNodeUpdate(nodeCfg *config.ClientConfig) error {
return err return err
} }
logger.Log(0, "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 return nil
} }
// Hello -- ping the broker to let server know node it's alive and well // Hello -- ping the broker to let server know node it's alive and well
func Hello(nodeCfg *config.ClientConfig) { func Hello(nodeCfg *config.ClientConfig) {
if err := publish(nodeCfg, fmt.Sprintf("ping/%s", nodeCfg.Node.ID), []byte(ncutils.Version), 0); err != nil { if err := publish(nodeCfg, fmt.Sprintf("ping/%s", nodeCfg.Node.ID), []byte(ncutils.Version), 0); err != nil {
logger.Log(0, fmt.Sprintf("error publishing ping, %v", err)) logger.Log(0, fmt.Sprintf("Network: %s error publishing ping, %v", nodeCfg.Node.Network, err))
logger.Log(0, "running pull on "+nodeCfg.Node.Network+" to reconnect") logger.Log(0, "running pull on "+nodeCfg.Node.Network+" to reconnect")
_, err := Pull(nodeCfg.Node.Network, true) _, err := Pull(nodeCfg.Node.Network, true)
if err != nil { if err != nil {

2
netclient/functions/pull.go
View File

@@ -90,7 +90,7 @@ func Pull(network string, iface bool) (*models.Node, error) {
} }
var bkupErr = config.SaveBackup(network) var bkupErr = config.SaveBackup(network)
if bkupErr != nil { if bkupErr != nil {
logger.Log(0, "unable to update backup file") logger.Log(0, "unable to update backup file for ", network)
} }
return &resNode, err return &resNode, err

4
netclient/functions/register.go
View File

@@ -80,7 +80,7 @@ func RegisterWithServer(private *ed25519.PrivateKey, cfg *config.ClientConfig) e
} }
if modServer { if modServer {
if err = config.ModServerConfig(&cfg.Server, cfg.Node.Network); err != nil { if err = config.ModServerConfig(&cfg.Server, cfg.Node.Network); err != nil {
logger.Log(0, "error overwriting config with broker information: "+err.Error()) logger.Log(0, "Network: ", cfg.Node.Network, "error overwriting config with broker information: "+err.Error())
} }
} }
@@ -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 { if err := tls.SaveCertToFile(ncutils.GetNetclientServerPath(cfg.Server.Server)+ncutils.GetSeparator(), "client.pem", &resp.Cert); err != nil {
return err return err
} }
logger.Log(0, "certificates/key saved ") logger.Log(0, "Network: ", cfg.Network, "certificates/key saved ")
//join the network defined in the token //join the network defined in the token
return nil return nil
} }