Merge pull request #3 from simplifi/logging_improvements

Improve logging output, add debug

Author: cjonesy

cmd/anemometer/cli/start.go

@@ -10,6 +10,7 @@ import (
 
 var (
 	configPath string
+	debug      bool
 )
 
 var startCmd = &cobra.Command{
@@ -27,6 +28,12 @@ func init() {
 		"c",
 		"/etc/anemometer.yml",
 		"the full path to the yaml config file, default: /etc/anemometer.yml")
+	startCmd.Flags().BoolVarP(
+		&debug,
+		"debug",
+		"d",
+		false,
+		"enable debugging output in the logs, default: false")
 	rootCmd.AddCommand(startCmd)
 }
 
@@ -47,7 +54,7 @@ func start() {
 		if err != nil {
 			log.Panicf("ERROR: Failed to start monitor '%v': %v", mtConfig.Name, err)
 		}
-		go mt.Start()
+		go mt.Start(debug)
 	}
 	// Block until something kills the process
 	<-exit

pkg/anemometer/monitor/monitor.go

@@ -78,15 +78,15 @@ func createStatsdClient(address string, tags []string) (*statsd.Client, error) {
 }
 
 // Start the Monitor
-func (m *Monitor) Start() {
+func (m *Monitor) Start(debug bool) {
 	for {
-		log.Printf("INFO: Sleeping for %d seconds", m.sleepDuration)
+		log.Printf("INFO: [%s] Sleeping for %d seconds", m.name, m.sleepDuration)
 		time.Sleep(time.Duration(m.sleepDuration) * time.Second)
 
 		// Execute our query
 		rows, err := m.databaseConn.Query(m.sql)
 		if err != nil {
-			log.Printf("ERROR: %v", err)
+			log.Printf("ERROR: [%s] %v", m.name, err)
 			sendErrorMetric(m.statsdClient, m.name)
 			continue
 		}
@@ -98,15 +98,15 @@ func (m *Monitor) Start() {
 			// Convert our result row into a map
 			rowMap, err := rowsToMap(cols, rows)
 			if err != nil {
-				log.Printf("ERROR: %v", err)
+				log.Printf("ERROR: [%s] %v", m.name, err)
 				sendErrorMetric(m.statsdClient, m.name)
 				continue
 			}
 
 			// Grab the metric column from the results and convert it
 			metric, err := getMetric(rowMap)
 			if err != nil {
-				log.Printf("ERROR: %v", err)
+				log.Printf("ERROR: [%s] %v", m.name, err)
 				sendErrorMetric(m.statsdClient, m.name)
 				continue
 			}
@@ -115,8 +115,17 @@ func (m *Monitor) Start() {
 			tags := getTags(rowMap)
 
 			// Push the metric to Datadog
+			if debug {
+				log.Printf(
+					"DEBUG: [%s] Publishing metric - Name: %s, Value: %f, Tags: %v",
+					m.name,
+					m.metric,
+					metric,
+					tags,
+				)
+			}
 			if err = m.statsdClient.Gauge(m.metric, metric, tags, 1); err != nil {
-				log.Printf("ERROR: %v", err)
+				log.Printf("ERROR: [%s] %v", m.name, err)
 				sendErrorMetric(m.statsdClient, m.name)
 			}
 		}