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

move logging to checkBroker function

Browse Source
This commit is contained in:
Matthew R. Kasun
2022-05-19 15:51:06 -04:00
committed by 0xdcarns
parent 979038171a
commit b6affbba36
2 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
netclient/functions/daemon.go
View File

@@ -242,14 +242,7 @@ func setupMQTT(cfg *config.ClientConfig, publish bool) mqtt.Client {
} else { } else {
err = token.Error() err = token.Error()
} }
brokerErr := checkBroker(cfg.Server.Server) checkBroker(cfg.Server.Server)
if brokerErr.Error() == "dns" {
logger.FatalLog("dns lookup failed for broker ... update dns records")
} else if brokerErr.Error() == "ping" {
logger.FatalLog("unable to connect to broker ... check firewalls")
} else if brokerErr != nil {
logger.Log(0, "unable to conncet to broker")
}
logger.Log(0, "could not connect to broker", cfg.Server.Server, err.Error()) logger.Log(0, "could not connect to broker", cfg.Server.Server, err.Error())
if strings.Contains(err.Error(), "connectex") || strings.Contains(err.Error(), "connect timeout") { if strings.Contains(err.Error(), "connectex") || strings.Contains(err.Error(), "connect timeout") {
logger.Log(0, "connection issue detected.. attempt connection with new certs") logger.Log(0, "connection issue detected.. attempt connection with new certs")

17
netclient/functions/mqpublish.go
View File

@@ -142,15 +142,7 @@ func publish(nodeCfg *config.ClientConfig, dest string, msg []byte, qos byte) er
err = token.Error() err = token.Error()
} }
if err != nil { if err != nil {
if brokerErr := checkBroker(nodeCfg.Server.Server); brokerErr != nil { checkBroker(nodeCfg.Server.Server)
if brokerErr.Error() == "dns" {
logger.Log(0, "dns lookup failed for", nodeCfg.Server.Server, "... update dns records")
} else if brokerErr.Error() == "ping" {
logger.Log(0, "unable to connect to broker ... check firewalls")
} else {
logger.Log(0, "unknown broker connection error")
}
}
return err return err
} }
} }
@@ -173,10 +165,10 @@ func checkCertExpiry(cfg *config.ClientConfig) error {
return nil return nil
} }
func checkBroker(broker string) error { func checkBroker(broker string) {
_, err := net.LookupIP(broker) _, err := net.LookupIP(broker)
if err != nil { if err != nil {
return errors.New("dns") logger.FatalLog("nslookup failed for broker ... check dns records")
} }
pinger := ping.NewTCPing() pinger := ping.NewTCPing()
pinger.SetTarget(&ping.Target{ pinger.SetTarget(&ping.Target{
@@ -190,7 +182,6 @@ func checkBroker(broker string) error {
pingerDone := pinger.Start() pingerDone := pinger.Start()
<-pingerDone <-pingerDone
if pinger.Result().SuccessCounter == 0 { if pinger.Result().SuccessCounter == 0 {
return errors.New("ping") logger.FatalLog("unable to connect to broker port ... check firewalls")
} }
return nil
} }