Add debug flag

Author: uubk

icinga.go

@@ -26,7 +26,8 @@ var icWarnState = map[string]bool{
 }
 
 type icingaCmd struct {
-	SimpleCFGLocation *string
+	CFGLocation *string
+	Debug       *bool
 	// Shared fields
 	icHostname     *string
 	icHostV4       *string
@@ -51,7 +52,8 @@ type icingaCmd struct {
 }
 
 func (this *icingaCmd) Init(flagSet *flag.FlagSet, isServiceCMD bool) {
-	this.SimpleCFGLocation = flagSet.String("cfg", "/etc/sendmsg.yml", "Path to sendmsg config")
+	this.CFGLocation = flagSet.String("cfg", "/etc/sendmsg.yml", "Path to sendmsg config")
+	this.Debug = flagSet.Bool("debug", false, "Whether to print verbose debug messages")
 	this.icHostname = flagSet.String("l", "", "Hostname")
 	this.icHostV4 = flagSet.String("4", "", "Host address (v4)")
 	this.icHostV6 = flagSet.String("6", "", "Host address (v6)")

sendmsg.go

@@ -32,24 +32,32 @@ func main() {
 	}
 
 	var cfglocation *string
+	var debug *bool
 	switch os.Args[1] {
 	case "simple":
 		simpleCommand.Parse(os.Args[2:])
-		cfglocation = simpleFrontendCmd.SimpleCFGLocation
+		cfglocation = simpleFrontendCmd.CFGLocation
+		debug = simpleFrontendCmd.Debug
 		break
 	case "icingaHost":
 		icingaHostCommand.Parse(os.Args[2:])
-		cfglocation = icingaHostCmd.SimpleCFGLocation
+		cfglocation = icingaHostCmd.CFGLocation
+		debug = icingaHostCmd.Debug
 		break
 	case "icingaService":
 		icingaServiceCommand.Parse(os.Args[2:])
-		cfglocation = icingaServiceCmd.SimpleCFGLocation
+		cfglocation = icingaServiceCmd.CFGLocation
+		debug = icingaServiceCmd.Debug
 		break
 	default:
 		flag.PrintDefaults()
 		return
 	}
 
+	if *debug {
+		logrus.SetLevel(logrus.DebugLevel)
+	}
+
 	cfg := Config{}
 	if contents, err := ioutil.ReadFile(*cfglocation); err == nil {
 		err = yaml.UnmarshalStrict(contents, &cfg)
@@ -60,6 +68,12 @@ func main() {
 		logrus.WithError(err).Fatal("Couldn't read the configuration file!")
 	}
 
+	logrus.WithFields(logrus.Fields{
+		"version":  gitversion,
+		"frontend": os.Args[1],
+		"backend":  cfg.Backend,
+	}).Info("Starting sendmsg")
+
 	var msg Message
 	if simpleCommand.Parsed() {
 		msg = simpleFrontendCmd.Parse()
@@ -81,5 +95,7 @@ func main() {
 	switch cfg.Backend {
 	case "slack":
 		send_with_slack(msg, cfg)
+	default:
+		logrus.WithField("backend", cfg.Backend).Fatal("Unkown backend!")
 	}
 }

simple.go

@@ -3,23 +3,25 @@ package main
 import "flag"
 
 type simpleCmdData struct {
-	SimpleCFGLocation *string
-	head              *string
-	title             *string
-	title_url         *string
-	body              *string
-	color             *string
-	fields            fieldList
+	CFGLocation *string
+	head        *string
+	title       *string
+	title_url   *string
+	body        *string
+	color       *string
+	fields      fieldList
+	Debug       *bool
 }
 
 func (this *simpleCmdData) Init(flagSet *flag.FlagSet) {
-	this.SimpleCFGLocation = flagSet.String("cfg", "/etc/sendmsg.yml", "Path to sendmsg config")
+	this.CFGLocation = flagSet.String("cfg", "/etc/sendmsg.yml", "Path to sendmsg config")
 	this.head = flagSet.String("head", "", "The header of the message to send (required)")
 	this.title = flagSet.String("title", "", "The title of the message to send (required)")
 	this.title_url = flagSet.String("title_url", "", "The url of the title of the message to send")
 	this.body = flagSet.String("body", "", "The body of the message to send")
 	this.color = flagSet.String("color", "", "The color of the message to send")
 	flagSet.Var(&this.fields, "fields", "A comma seperated list of fields (name:text) to be added")
+	this.Debug = flagSet.Bool("debug", false, "Whether to print verbose debug messages")
 }
 
 func (this *simpleCmdData) Parse() Message {

slack.go

@@ -76,8 +76,6 @@ func send_with_slack(msg Message, cfg Config) {
 	bodyString := string(bodyBytes)
 
 	if bodyString != "ok" {
-		logrus.WithFields(logrus.Fields{
-			"rc": bodyString,
-		}).Warnf("Slack didn't return 'OK'")
+		logrus.WithField("rc", bodyString).Warnf("Slack didn't return 'OK'")
 	}
 }