return if failed describing TrustedAdbisor check

shamil · Sep 19, 2019 · 837fb39 · 837fb39
1 parent 3a20e86
commit 837fb39
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.1.0
+0.1.1
diff --git a/collector.go b/collector.go
@@ -107,6 +107,7 @@ func (c *Collector) scrape(ch chan<- prometheus.Metric) {
 	if err != nil {
 		log.With("err", err).Errorf("failed describing TrustedAdbisor check")
 		scrapeError.Set(1)
+		return
 	}
 
 	for _, d := range result.FlaggedResources {
@@ -116,7 +117,6 @@ func (c *Collector) scrape(ch chan<- prometheus.Metric) {
 	}
 
 	if time.Now().After(c.nextRefreshTime) {
-		log.Info("refreshing TrustedAdvisor check...")
 		result, err := c.awsSupport.RefreshtS3BucketPermissionsCheck()
 
 		if err != nil {
@@ -125,6 +125,7 @@ func (c *Collector) scrape(ch chan<- prometheus.Metric) {
 		}
 
 		c.nextRefreshTime = time.Now().Add(time.Duration(*result.MillisUntilNextRefreshable) * time.Millisecond)
+		log.Infof("refreshed TrustedAdvisor check, next refresh after %v", c.nextRefreshTime.Format("2 Jan 2006 15:04:05"))
 	}
 }
 

diff --git a/exporter.go b/exporter.go
@@ -38,6 +38,6 @@ func main() {
 			</html>`))
 	})
 
-	log.Infoln("Listening on", *listenAddress)
+	log.Infoln("listening on", *listenAddress)
 	log.Fatal(http.ListenAndServe(*listenAddress, nil))
 }