Merge branch 'thorhs-exit_on_config_parse_failure'

ibmmqmet · ibmmqmet · commit 6474fb530808 · 2021-04-19T08:37:55.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Changelog
 Newest updates are at the top of this file.
 
+### Apr 15 2021
+* Don't check for QMGR name unless config parse was a success
+
 ### Apr 8 2021
 * Update Dockerfile.run to move default configuration params to environment variables
 
diff --git a/cmd/mq_aws/config.go b/cmd/mq_aws/config.go
@@ -50,7 +50,7 @@ var cfy mqExporterConfigYaml
 /*
 initConfig parses the command line parameters.
 */
-func initConfig() {
+func initConfig() error {
 
 	var err error
 
@@ -104,4 +104,6 @@ func initConfig() {
 		log.Errorln("Warning: Data from 'RESET QSTATS' has been requested.")
 		log.Errorln("Ensure no other monitoring applications are also using that command.")
 	}
+
+	return err
 }
diff --git a/cmd/mq_aws/main.go b/cmd/mq_aws/main.go
@@ -36,25 +36,28 @@ var discoverConfig mqmetric.DiscoverConfig
 
 func main() {
 	var err error
+	var d time.Duration
 
 	cf.PrintInfo("IBM MQ metrics exporter for AWS CloudWatch monitoring", BuildStamp, GitCommit, BuildPlatform)
 
-	initConfig()
+	err = initConfig()
 
-	if config.cf.QMgrName == "" {
+	if err == nil && config.cf.QMgrName == "" {
 		log.Errorln("Must provide a queue manager name to connect to.")
 		os.Exit(72)
 	}
 
-	interval := config.ci.Interval
-	d, err := time.ParseDuration(interval)
-	if err != nil || d.Seconds() <= 1 {
-		log.Errorln("Invalid value or too short for interval parameter: ", err)
-		os.Exit(1)
-	}
+	if err == nil {
+		interval := config.ci.Interval
+		d, err := time.ParseDuration(interval)
+		if err != nil || d.Seconds() <= 1 {
+			log.Errorln("Invalid value or too short for interval parameter: ", err)
+			os.Exit(1)
+		}
 
-	// Connect and open standard queues
-	err = mqmetric.InitConnection(config.cf.QMgrName, config.cf.ReplyQ, &config.cf.CC)
+		// Connect and open standard queues
+		err = mqmetric.InitConnection(config.cf.QMgrName, config.cf.ReplyQ, &config.cf.CC)
+	}
 	if err == nil {
 		log.Infoln("Connected to queue manager ", config.cf.QMgrName)
 	} else {
diff --git a/cmd/mq_coll/config.go b/cmd/mq_coll/config.go
@@ -49,7 +49,7 @@ var cfy mqExporterConfigYaml
 /*
 initConfig parses the command line parameters.
 */
-func initConfig() {
+func initConfig() error {
 
 	cf.InitConfig(&config.cf)
 
@@ -91,4 +91,6 @@ func initConfig() {
 	} else {
 		config.hostlabel = config.hostname
 	}
+
+	return err
 }
diff --git a/cmd/mq_coll/main.go b/cmd/mq_coll/main.go
@@ -36,23 +36,26 @@ var discoverConfig mqmetric.DiscoverConfig
 
 func main() {
 	var err error
+	var d time.Duration
 
 	cf.PrintInfo("IBM MQ metrics exporter for collectd", BuildStamp, GitCommit, BuildPlatform)
 
-	initConfig()
+	err = initConfig()
 
-	if config.cf.QMgrName == "" {
+	if err == nil && config.cf.QMgrName == "" {
 		log.Errorln("Must provide a queue manager name to connect to.")
 		os.Exit(72)
 	}
-	d, err := time.ParseDuration(config.interval)
-	if err != nil || d.Seconds() <= 1 {
-		log.Errorln("Invalid or too short value for interval parameter: ", err)
-		os.Exit(1)
-	}
+	if err == nil {
+		d, err = time.ParseDuration(config.interval)
+		if err != nil || d.Seconds() <= 1 {
+			log.Errorln("Invalid or too short value for interval parameter: ", err)
+			os.Exit(1)
+		}
 
-	// Connect and open standard queues
-	err = mqmetric.InitConnection(config.cf.QMgrName, config.cf.ReplyQ, &config.cf.CC)
+		// Connect and open standard queues
+		err = mqmetric.InitConnection(config.cf.QMgrName, config.cf.ReplyQ, &config.cf.CC)
+	}
 	if err == nil {
 		log.Infoln("Connected to queue manager ", config.cf.QMgrName)
 	} else {
diff --git a/cmd/mq_influx/main.go b/cmd/mq_influx/main.go
@@ -38,23 +38,26 @@ var discoverConfig mqmetric.DiscoverConfig
 func main() {
 	var err error
 	var c client.Client
+	var d time.Duration
 
 	cf.PrintInfo("IBM MQ metrics exporter for InfluxDB monitoring", BuildStamp, GitCommit, BuildPlatform)
 
 	err = initConfig()
 
-	if config.cf.QMgrName == "" {
+	if err == nil && config.cf.QMgrName == "" {
 		log.Errorln("Must provide a queue manager name to connect to.")
 		os.Exit(72)
 	}
-	d, err := time.ParseDuration(config.ci.Interval)
-	if err != nil || d.Seconds() <= 1 {
-		log.Errorln("Invalid or too short value for interval parameter: ", err)
-		os.Exit(1)
-	}
+	if err == nil {
+		d, err = time.ParseDuration(config.ci.Interval)
+		if err != nil || d.Seconds() <= 1 {
+			log.Errorln("Invalid or too short value for interval parameter: ", err)
+			os.Exit(1)
+		}
 
-	// Connect and open standard queues
-	err = mqmetric.InitConnection(config.cf.QMgrName, config.cf.ReplyQ, &config.cf.CC)
+		// Connect and open standard queues
+		err = mqmetric.InitConnection(config.cf.QMgrName, config.cf.ReplyQ, &config.cf.CC)
+	}
 	if err == nil {
 		log.Infoln("Connected to queue manager ", config.cf.QMgrName)
 	} else {
diff --git a/cmd/mq_json/config.go b/cmd/mq_json/config.go
@@ -51,7 +51,7 @@ func initConfig() error {
 
 	cf.AddParm(&config.interval, "10s", cf.CP_STR, "ibmmq.interval", "json", "interval", "How long between each collection")
 
-	cf.ParseParms()
+	err = cf.ParseParms()
 
 	if err == nil {
 		if config.cf.ConfigFile != "" {
diff --git a/cmd/mq_json/main.go b/cmd/mq_json/main.go
@@ -51,29 +51,33 @@ func printInfo(title string, stamp string, commit string, buildPlatform string)
 
 func main() {
 	var err error
+	var d time.Duration
 
-	initConfig()
+	err = initConfig()
 
 	printInfo("Starting IBM MQ metrics exporter for JSON", BuildStamp, GitCommit, BuildPlatform)
 
-	if config.cf.QMgrName == "" {
+	if err == nil && config.cf.QMgrName == "" {
 		log.Errorln("Must provide a queue manager name to connect to.")
 		os.Exit(72)
 	}
-	d, err := time.ParseDuration(config.interval)
-	if err != nil || d.Seconds() <= 1 {
-		log.Errorln("Invalid or too short value for interval parameter: ", err)
-		os.Exit(1)
-	}
+	if err == nil {
+		d, err = time.ParseDuration(config.interval)
+		if err != nil || d.Seconds() <= 1 {
+			log.Errorln("Invalid or too short value for interval parameter: ", err)
+			os.Exit(1)
+		}
 
-	if config.cf.CC.UseResetQStats {
-		log.Warnln("Warning: Data from 'RESET QSTATS' has been requested. Ensure no other monitoring applications are also using that command.")
-	}
+		if config.cf.CC.UseResetQStats {
+			log.Warnln("Warning: Data from 'RESET QSTATS' has been requested. Ensure no other monitoring applications are also using that command.")
+		}
+
+		log.Infoln("Starting IBM MQ metrics exporter for JSON")
 
-	log.Infoln("Starting IBM MQ metrics exporter for JSON")
+		// Connect and open standard queues
+		err = mqmetric.InitConnection(config.cf.QMgrName, config.cf.ReplyQ, &config.cf.CC)
+	}
 
-	// Connect and open standard queues
-	err = mqmetric.InitConnection(config.cf.QMgrName, config.cf.ReplyQ, &config.cf.CC)
 	if err == nil {
 		log.Infoln("Connected to queue manager ", config.cf.QMgrName)
 	} else {
diff --git a/cmd/mq_opentsdb/config.go b/cmd/mq_opentsdb/config.go
@@ -52,7 +52,7 @@ var cfy mqExporterConfigYaml
 /*
 initConfig parses the command line parameters.
 */
-func initConfig() {
+func initConfig() error {
 	var err error
 
 	cf.InitConfig(&config.cf)
@@ -63,7 +63,7 @@ func initConfig() {
 	cf.AddParm(&config.ci.MaxPoints, 30, cf.CP_INT, "ibmmq.maxPoints", "opentsdb", "maxPoints", "Maximum number of points to include in each write to the server")
 	cf.AddParm(&config.ci.MetricPrefix, "ibmmq", cf.CP_STR, "ibmmq.seriesPrefix", "opentsdb", "seriesPrefix", "Prefix for all the MQ metric series")
 
-	cf.ParseParms()
+	err = cf.ParseParms()
 
 	if err == nil {
 		if config.cf.ConfigFile != "" {
@@ -81,6 +81,7 @@ func initConfig() {
 			}
 		}
 	}
+
 	if err == nil {
 		cf.InitLog(config.cf)
 	}
@@ -103,4 +104,6 @@ func initConfig() {
 		log.Errorln("Warning: Data from 'RESET QSTATS' has been requested.")
 		log.Errorln("Ensure no other monitoring applications are also using that command.")
 	}
+
+	return err
 }
diff --git a/cmd/mq_opentsdb/main.go b/cmd/mq_opentsdb/main.go
@@ -36,28 +36,31 @@ var discoverConfig mqmetric.DiscoverConfig
 
 func main() {
 	var err error
+	var d time.Duration
 
 	cf.PrintInfo("IBM MQ metrics exporter for OpenTSDB monitoring", BuildStamp, GitCommit, BuildPlatform)
 
-	initConfig()
+	err = initConfig()
 
-	if config.cf.QMgrName == "" {
+	if err == nil && config.cf.QMgrName == "" {
 		log.Errorln("Must provide a queue manager name to connect to.")
 		os.Exit(72)
 	}
 
-	interval := config.ci.Interval
-	if !strings.HasSuffix(interval, "s") {
-		interval += "s"
-	}
-	d, err := time.ParseDuration(interval)
-	if err != nil || d.Seconds() <= 1 {
-		log.Errorln("Invalid or too short value for interval parameter: ", err)
-		os.Exit(1)
-	}
+	if err == nil {
+		interval := config.ci.Interval
+		if !strings.HasSuffix(interval, "s") {
+			interval += "s"
+		}
+		d, err = time.ParseDuration(interval)
+		if err != nil || d.Seconds() <= 1 {
+			log.Errorln("Invalid or too short value for interval parameter: ", err)
+			os.Exit(1)
+		}
 
-	// Connect and open standard queues
-	err = mqmetric.InitConnection(config.cf.QMgrName, config.cf.ReplyQ, &config.cf.CC)
+		// Connect and open standard queues
+		err = mqmetric.InitConnection(config.cf.QMgrName, config.cf.ReplyQ, &config.cf.CC)
+	}
 	if err == nil {
 		log.Infoln("Connected to queue manager ", config.cf.QMgrName)
 	} else {
diff --git a/cmd/mq_prometheus/config.go b/cmd/mq_prometheus/config.go
@@ -1,7 +1,7 @@
 package main
 
 /*
-  Copyright (c) IBM Corporation 2016, 2019
+  Copyright (c) IBM Corporation 2016, 2021
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/cmd/mq_prometheus/main.go b/cmd/mq_prometheus/main.go
@@ -47,7 +47,7 @@ func main() {
 	// Print this because it's easy to get the escapes wrong from a shell script with wildcarded topics ('#')
 	log.Debugf("Monitored topics are '%s'", config.cf.MonitoredTopics)
 
-	if config.cf.QMgrName == "" {
+	if err == nil && config.cf.QMgrName == "" {
 		log.Errorln("Must provide a queue manager name to connect to.")
 		os.Exit(72) // Same as strmqm "queue manager name error"
 	}

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ var cfy mqExporterConfigYaml`
`50`	`50`	`/*`
`51`	`51`	`initConfig parses the command line parameters.`
`52`	`52`	`*/`
`53`		`-func initConfig() {`
	`53`	`+func initConfig() error {`
`54`	`54`
`55`	`55`	`var err error`
`56`	`56`
`@@ -104,4 +104,6 @@ func initConfig() {`
`104`	`104`	`log.Errorln("Warning: Data from 'RESET QSTATS' has been requested.")`
`105`	`105`	`log.Errorln("Ensure no other monitoring applications are also using that command.")`
`106`	`106`	`}`
	`107`	`+`
	`108`	`+ return err`
`107`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ var cfy mqExporterConfigYaml`
`49`	`49`	`/*`
`50`	`50`	`initConfig parses the command line parameters.`
`51`	`51`	`*/`
`52`		`-func initConfig() {`
	`52`	`+func initConfig() error {`
`53`	`53`
`54`	`54`	`cf.InitConfig(&config.cf)`
`55`	`55`
`@@ -91,4 +91,6 @@ func initConfig() {`
`91`	`91`	`} else {`
`92`	`92`	`config.hostlabel = config.hostname`
`93`	`93`	`}`
	`94`	`+`
	`95`	`+ return err`
`94`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ var cfy mqExporterConfigYaml`
`52`	`52`	`/*`
`53`	`53`	`initConfig parses the command line parameters.`
`54`	`54`	`*/`
`55`		`-func initConfig() {`
	`55`	`+func initConfig() error {`
`56`	`56`	`var err error`
`57`	`57`
`58`	`58`	`cf.InitConfig(&config.cf)`
`@@ -63,7 +63,7 @@ func initConfig() {`
`63`	`63`	`cf.AddParm(&config.ci.MaxPoints, 30, cf.CP_INT, "ibmmq.maxPoints", "opentsdb", "maxPoints", "Maximum number of points to include in each write to the server")`
`64`	`64`	`cf.AddParm(&config.ci.MetricPrefix, "ibmmq", cf.CP_STR, "ibmmq.seriesPrefix", "opentsdb", "seriesPrefix", "Prefix for all the MQ metric series")`
`65`	`65`
`66`		`- cf.ParseParms()`
	`66`	`+ err = cf.ParseParms()`
`67`	`67`
`68`	`68`	`if err == nil {`
`69`	`69`	`if config.cf.ConfigFile != "" {`
`@@ -81,6 +81,7 @@ func initConfig() {`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`	`}`
	`84`	`+`
`84`	`85`	`if err == nil {`
`85`	`86`	`cf.InitLog(config.cf)`
`86`	`87`	`}`
`@@ -103,4 +104,6 @@ func initConfig() {`
`103`	`104`	`log.Errorln("Warning: Data from 'RESET QSTATS' has been requested.")`
`104`	`105`	`log.Errorln("Ensure no other monitoring applications are also using that command.")`
`105`	`106`	`}`
	`107`	`+`
	`108`	`+ return err`
`106`	`109`	`}`