From b6affbba3659b7c2cb29602b621b91e9411d4246 Mon Sep 17 00:00:00 2001
From: "Matthew R. Kasun" <mkasun@nusak.ca>
Date: Thu, 19 May 2022 15:51:06 -0400
Subject: [PATCH] move logging to checkBroker function

---
 netclient/functions/daemon.go    |  9 +--------
 netclient/functions/mqpublish.go | 17 ++++-------------
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/netclient/functions/daemon.go b/netclient/functions/daemon.go
index aaba87ff..3be6090a 100644
--- a/netclient/functions/daemon.go
+++ b/netclient/functions/daemon.go
@@ -242,14 +242,7 @@ func setupMQTT(cfg *config.ClientConfig, publish bool) mqtt.Client {
 		} else {
 			err = token.Error()
 		}
-		brokerErr := 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")
-		}
+		checkBroker(cfg.Server.Server)
 		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") {
 			logger.Log(0, "connection issue detected.. attempt connection with new certs")
diff --git a/netclient/functions/mqpublish.go b/netclient/functions/mqpublish.go
index 37c99959..5ec0332f 100644
--- a/netclient/functions/mqpublish.go
+++ b/netclient/functions/mqpublish.go
@@ -142,15 +142,7 @@ func publish(nodeCfg *config.ClientConfig, dest string, msg []byte, qos byte) er
 			err = token.Error()
 		}
 		if err != nil {
-			if brokerErr := checkBroker(nodeCfg.Server.Server); brokerErr != nil {
-				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")
-				}
-			}
+			checkBroker(nodeCfg.Server.Server)
 			return err
 		}
 	}
@@ -173,10 +165,10 @@ func checkCertExpiry(cfg *config.ClientConfig) error {
 	return nil
 }
 
-func checkBroker(broker string) error {
+func checkBroker(broker string) {
 	_, err := net.LookupIP(broker)
 	if err != nil {
-		return errors.New("dns")
+		logger.FatalLog("nslookup failed for broker ... check dns records")
 	}
 	pinger := ping.NewTCPing()
 	pinger.SetTarget(&ping.Target{
@@ -190,7 +182,6 @@ func checkBroker(broker string) error {
 	pingerDone := pinger.Start()
 	<-pingerDone
 	if pinger.Result().SuccessCounter == 0 {
-		return errors.New("ping")
+		logger.FatalLog("unable to connect to broker port ... check firewalls")
 	}
-	return nil
 }