Ensure that we report up metric when query fails

ewr · ewr · commit 84aa754e27f1 · 2015-08-28T09:34:27.000-04:00
Previously, we were correctly setting the value for up to 0, but not passing that along. Fixes #6.
diff --git a/elasticsearch_exporter.go b/elasticsearch_exporter.go
@@ -234,6 +234,8 @@ func (e *Exporter) Collect(ch chan<- prometheus.Metric) {
 		vec.Reset()
 	}
 
+  defer func() { ch <- e.up }()
+
 	resp, err := e.client.Get(e.URI)
 	if err != nil {
 		e.up.Set(0)
@@ -329,7 +331,6 @@ func (e *Exporter) Collect(ch chan<- prometheus.Metric) {
 	}
 
 	// Report metrics.
-	ch <- e.up
 
 	for _, vec := range e.counterVecs {
 		vec.Collect(ch)

Original file line number	Diff line number	Diff line change
`@@ -234,6 +234,8 @@ func (e *Exporter) Collect(ch chan<- prometheus.Metric) {`
`234`	`234`	`vec.Reset()`
`235`	`235`	`}`
`236`	`236`
	`237`	`+ defer func() { ch <- e.up }()`
	`238`	`+`
`237`	`239`	`resp, err := e.client.Get(e.URI)`
`238`	`240`	`if err != nil {`
`239`	`241`	`e.up.Set(0)`
`@@ -329,7 +331,6 @@ func (e *Exporter) Collect(ch chan<- prometheus.Metric) {`
`329`	`331`	`}`
`330`	`332`
`331`	`333`	`// Report metrics.`
`332`		`- ch <- e.up`
`333`	`334`
`334`	`335`	`for _, vec := range e.counterVecs {`
`335`	`336`	`vec.Collect(ch)`