logging cleanup

scraper.go

@@ -156,7 +156,7 @@ func (s *Scraper) scrape() bool {
 	ret := true
 	for _, q := range queries {
 		if err := scrapeQuery(l, q); err != nil {
-			s.log.WithError(err).Warn("query failed")
+			s.log.WithError(err).WithField("filter", q.searchFilter).Warn("query failed")
 			ret = false
 		}
 	}

server.go

@@ -73,12 +73,12 @@ func (s *Server) adaptor(kvs ...interface{}) error {
 		key := fmt.Sprint(kvs[i])
 		fields[key] = kvs[i+1]
 	}
-	msg := ""
+	var msg string
 	if val, ok := fields["msg"]; ok {
 		delete(fields, "msg")
 		msg = fmt.Sprint(val)
 	}
-	level := "info"
+	var level string
 	if val, ok := fields["level"]; ok {
 		delete(fields, "level")
 		level = fmt.Sprint(val)