Merge pull request #22 from ton31337/Fix/move_queue_check_outside

Move regexp check outside if for queueMetricsCounter
kbudde · Nov 19, 2016 · cfe83fd · cfe83fd
2 parents b7ade0b + ce59dbb
commit cfe83fd
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/exporter.go b/exporter.go
@@ -69,13 +69,13 @@ func (e *exporter) fetchRabbit(ch chan<- prometheus.Metric) {
 	}
 	for key, countvec := range e.queueMetricsCounter {
 		for _, queue := range rabbitMqQueueData {
-			if value, ok := queue.metrics[key]; ok {
-				if match, _ := regexp.MatchString(config.SkipQueues, strings.ToLower(queue.name)); !match {
+			if match, _ := regexp.MatchString(config.SkipQueues, strings.ToLower(queue.name)); !match {
+				if value, ok := queue.metrics[key]; ok {
 					log.WithFields(log.Fields{"vhost": queue.vhost, "queue": queue.name, "key": key, "value": value}).Debug("Set queue metric for key")
 					ch <- prometheus.MustNewConstMetric(countvec, prometheus.CounterValue, value, queue.vhost, queue.name)
+				} else {
+					ch <- prometheus.MustNewConstMetric(countvec, prometheus.CounterValue, 0, queue.vhost, queue.name)
 				}
-			} else {
-				ch <- prometheus.MustNewConstMetric(countvec, prometheus.CounterValue, 0, queue.vhost, queue.name)
 			}
 		}
 	}