logging cleanup

tomcz · tomcz · commit b6f2972dedc0 · 2021-06-01T05:31:48.000+10:00
diff --git a/scraper.go b/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
 		}
 	}
diff --git a/server.go b/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)

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ func (s *Scraper) scrape() bool {`
`156`	`156`	`ret := true`
`157`	`157`	`for _, q := range queries {`
`158`	`158`	`if err := scrapeQuery(l, q); err != nil {`
`159`		`- s.log.WithError(err).Warn("query failed")`
	`159`	`+ s.log.WithError(err).WithField("filter", q.searchFilter).Warn("query failed")`
`160`	`160`	`ret = false`
`161`	`161`	`}`
`162`	`162`	`}`