Complete migration to logrus

Author: uubk

Gopkg.lock

@@ -4,7 +4,6 @@ import (
 	"flag"
 	"bytes"
 	"net/url"
-	"fmt"
 	"time"
 	"github.com/sirupsen/logrus"
 	"strconv"
@@ -70,10 +69,9 @@ func (this *icingaHostCmd) Parse() Message {
 		logrus.WithFields(logrus.Fields{
 			"error": err,
 		}).Warn("Couldn't parse supplied timestamp")
-		panic("Abort")
 	} else {
-		time := convertToSlackDate(timestamp)
-		addFieldToMessage(&msg, true, "Timestamp", &time)
+		timeStr := convertToSlackDate(timestamp)
+		addFieldToMessage(&msg, true, "Timestamp", &timeStr)
 	}
 
 	var buffer bytes.Buffer
@@ -88,13 +86,9 @@ func (this *icingaHostCmd) Parse() Message {
 	msg.Body = buffer.String()
 
 	if *this.icURL != "" {
-		if err != nil {
-			fmt.Errorf("WARNING: Couldn't parse specified url, skipping link: ", err)
-		} else {
-			params := url.Values{}
-			params.Add("host", *this.icHostname)
-			msg.Body_link = *this.icURL + "/monitoring/host/show?"+ params.Encode()
-		}
+		params := url.Values{}
+		params.Add("host", *this.icHostname)
+		msg.Body_link = *this.icURL + "/monitoring/host/show?"+ params.Encode()
 	}
 
 	if icBadState[*this.icHostState] {

icinga_host.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"flag"
-	"fmt"
 	"github.com/sirupsen/logrus"
 	"gopkg.in/yaml.v2"
 	"io/ioutil"
@@ -25,8 +24,7 @@ func main() {
 	icingaHostCmd.Init(icingaHostCommand)
 
 	if len(os.Args) < 2 {
-		fmt.Print("Please use one of [simple, icingaHost]\n")
-		return
+		logrus.Fatal("Please use one of [simple, icingaHost]")
 	}
 
 	var cfglocation *string
@@ -48,12 +46,10 @@ func main() {
 	if contents, err := ioutil.ReadFile(*cfglocation); err == nil {
 		err = yaml.UnmarshalStrict(contents, &cfg)
 		if err != nil {
-			fmt.Println("ERROR: Couldn't parse the configuration file!", err)
-			os.Exit(-1)
+			logrus.WithError(err).Fatal("Couldn't parse the configuration file!")
 		}
 	} else {
-		fmt.Println("ERROR: Couldn't read the configuration file!", err)
-		os.Exit(-1)
+		logrus.WithError(err).Fatal("Couldn't read the configuration file!")
 	}
 
 	var msg Message
@@ -65,8 +61,10 @@ func main() {
 	}
 
 	if msg.Body == "" || msg.Body_title == "" {
-		fmt.Println("ERROR: Either title or body are missing. Aborting now!")
-		return
+		logrus.WithFields(logrus.Fields{
+			"Body": msg.Body,
+			"Title": msg.Body_title,
+		}).Fatal("Either title or body are missing!")
 	}
 
 	switch cfg.Backend {

sendmsg.go

@@ -3,9 +3,9 @@ package main
 import (
 	"bytes"
 	"encoding/json"
-	"fmt"
 	"io/ioutil"
 	"net/http"
+	"github.com/sirupsen/logrus"
 )
 
 type SlackField struct {
@@ -61,24 +61,23 @@ func send_with_slack(msg Message, cfg Config) {
 
 	jsonBody, err := json.Marshal(body)
 	if err != nil {
-		fmt.Errorf("Coudln't masrshal message for JSON transport: ", err)
-		return
+		logrus.WithError(err).Fatal("Couldn't marshal message for JSON transport!")
 	}
 	resp, err := http.Post(cfg.Webhook, "application/reader", bytes.NewBuffer(jsonBody))
 	if err != nil {
-		fmt.Errorf("Coudln't POST message to webhook: ", err)
-		return
+		logrus.WithError(err).Fatal("Couldn't POST message to webhook!")
 	}
 	defer resp.Body.Close()
 
 	bodyBytes, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
-		fmt.Errorf("Couldn't read body", err)
+		logrus.WithError(err).Warnf("Couldn't read back response body!")
 	}
 	bodyString := string(bodyBytes)
-	fmt.Print(bodyString)
 
 	if bodyString != "ok" {
-		fmt.Errorf("Slack didn't like what we sent, error: ", bodyString)
+		logrus.WithFields(logrus.Fields{
+			"rc": bodyString,
+		}).Warnf("Slack didn't return 'OK'")
 	}
 }