fixed panic happening when trying to call res.Body.Close() on URLs that failed DNS resolution as reported by mcqueenorama. cleaned up error messages. fixed email credential check

Author: ARolek

lilpinger.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"fmt"
 	"io/ioutil"
 	"log"
 	"net/http"
@@ -17,6 +16,8 @@ var (
 )
 
 func main() {
+	var err error
+
 	//	read our text file of urls
 	fileData, err := ioutil.ReadFile(config.Params.URLsFile)
 	if err != nil {
@@ -36,7 +37,7 @@ func main() {
 
 	//	output logs to the terminal
 	for i := range c {
-		fmt.Println(i)
+		log.Println(i)
 	}
 }
 
@@ -48,12 +49,9 @@ func ping(url string) {
 
 		//	make our request
 		res, err := http.Get(url)
-
 		if err != nil {
 			msg := "Error:" + err.Error()
 
-			fmt.Println(msg)
-
 			c <- msg
 			reportError(msg)
 		} else {
@@ -68,9 +66,10 @@ func ping(url string) {
 
 			msg = url + ", lag: " + lag.String()
 			c <- msg
+
+			res.Body.Close()
 		}
 
-		res.Body.Close()
 		time.Sleep(time.Duration(config.Params.PingInterval) * time.Second)
 	}
 }

tools/SMS.go

@@ -10,7 +10,7 @@ import (
 
 func SendSMS(msg string) {
 	if config.Params.Twilio.AccountSid == "" || config.Params.Twilio.AuthToken == "" {
-		log.Println("twilio creds not set")
+		log.Println("twilio creds not set. skipping SMS notification")
 		return
 	}
 

tools/SMTP.go

@@ -9,8 +9,11 @@ import (
 )
 
 func SendMail(msg string) {
+	var err error
+
 	if config.Params.SMTP.Email == "" || config.Params.SMTP.Password == "" || config.Params.SMTP.Server == "" || config.Params.SMTP.Port == "" {
-		log.Println("SMTP creds not set")
+		log.Println("SMTP creds not set. skipping email notification")
+		return
 	}
 
 	auth := smtp.PlainAuth(
@@ -21,7 +24,7 @@ func SendMail(msg string) {
 	)
 
 	server := fmt.Sprintf("%v:%v", config.Params.SMTP.Server, config.Params.SMTP.Port)
-	err := smtp.SendMail(
+	err = smtp.SendMail(
 		server,
 		auth,
 		config.Params.SMTP.Email,
@@ -30,6 +33,6 @@ func SendMail(msg string) {
 	)
 
 	if err != nil {
-		fmt.Println("Error sending mail - %v - message: ", err, msg)
+		log.Printf("error sending mail: %v. message: %v\n", err, msg)
 	}
 }