fixes

- improved log levels
- less error prone float string parsing
- TODOs for more & better measurement_faulty checks
- go fmt

core/checkrunner.go

@@ -86,7 +86,7 @@ func (results BoxCheckResults) Log() {
 }
 
 func CheckBoxes(boxLocalConfs map[string]*NotifyConfig, osem *OsemClient) (BoxCheckResults, error) {
-	log.Debug("Checking notifications for ", len(boxLocalConfs), " box(es)")
+	log.Info("Checking notifications for ", len(boxLocalConfs), " box(es)")
 
 	results := BoxCheckResults{}
 	errs := []string{}
@@ -94,7 +94,7 @@ func CheckBoxes(boxLocalConfs map[string]*NotifyConfig, osem *OsemClient) (BoxCh
 	// @TODO: check boxes in parallel, capped at 5 at once. and/or rate limit?
 	for boxId, localConf := range boxLocalConfs {
 		boxLogger := log.WithField("boxId", boxId)
-		boxLogger.Info("checking box for events")
+		boxLogger.Debug("checking box for events")
 
 		box, res, err := checkBox(boxId, localConf, osem)
 		if err != nil {

core/healthcheck_measurement_faulty.go

@@ -2,7 +2,8 @@ package core
 
 import (
 	"fmt"
-	"strconv"
+
+	"github.com/noerw/osem_notify/utils"
 )
 
 var checkMeasurementFaulty = checkType{
@@ -20,7 +21,7 @@ var checkMeasurementFaulty = checkType{
 			Status:     CheckOk,
 		}
 
-		val, err := strconv.ParseFloat(s.LastMeasurement.Value, 64)
+		val, err := utils.ParseFloat(s.LastMeasurement.Value)
 		if err != nil {
 			return result, err
 		}
@@ -42,8 +43,10 @@ type faultyValue struct {
 }
 
 var faultyVals = map[faultyValue]bool{
+	// @TODO: add UV & light sensor: check for 0 if not sunset based on boxlocation
+	// @TODO: add BME280 and other sensors..
 	faultyValue{sensor: "BMP280", val: 0.0}:  true,
-	faultyValue{sensor: "HDC1008", val: 0.0}: true,
+	faultyValue{sensor: "HDC1008", val: 0.0}: true, // @FIXME: check should be on luftfeuchte only!
 	faultyValue{sensor: "HDC1008", val: -40}: true,
-	faultyValue{sensor: "SDS 011", val: 0.0}: true,
+	faultyValue{sensor: "SDS 011", val: 0.0}: true, // @FIXME: 0.0 seems to be a correct value, need to check over longer periods
 }

core/healthcheck_measurement_minmax.go

@@ -2,7 +2,8 @@ package core
 
 import (
 	"fmt"
-	"strconv"
+
+	"github.com/noerw/osem_notify/utils"
 )
 
 const (
@@ -36,12 +37,12 @@ func validateMeasurementMinMax(e NotifyEvent, s Sensor, b Box) (CheckResult, err
 		Status:     CheckOk,
 	}
 
-	thresh, err := strconv.ParseFloat(e.Threshold, 64)
+	thresh, err := utils.ParseFloat(e.Threshold)
 	if err != nil {
 		return result, err
 	}
 
-	val, err := strconv.ParseFloat(s.LastMeasurement.Value, 64)
+	val, err := utils.ParseFloat(s.LastMeasurement.Value)
 	if err != nil {
 		return result, err
 	}

core/healthchecks.go

@@ -84,7 +84,7 @@ func (box Box) RunChecks() ([]CheckResult, error) {
 
 			result, err := checker.checkFunc(event, s, box)
 			if err != nil {
-				boxLogger.Errorf("error checking event %s", event.Type)
+				boxLogger.Errorf("error checking event %s: %v", event.Type, err)
 			}
 
 			results = append(results, result)

core/notifier_email.go

@@ -65,11 +65,12 @@ func (n EmailNotifier) Submit(notification Notification) error {
 
 	from := viper.GetString("email.from")
 	body := fmt.Sprintf(
-		"From: openSenseMap Notifier <%s>\nDate: %s\nSubject: %s\nContent-Type: text/plain; charset=\"utf-8\"\n\n%s",
+		"From: openSenseMap Notifier <%s>\nDate: %s\nSubject: %s\nContent-Type: text/plain; charset=\"utf-8\"\n\n%s%s",
 		from,
 		time.Now().Format(time.RFC1123Z),
 		notification.Subject,
-		notification.Body)
+		notification.Body,
+		"\n\n--\nSent automatically by osem_notify (https://github.com/noerw/osem_notify)")
 
 	// Connect to the server, authenticate, set the sender and recipient,
 	// and send the email all in one step.

core/notifiers.go

@@ -155,7 +155,7 @@ func ComposeNotification(box *Box, checks []CheckResult) Notification {
 	return Notification{
 		Status:  status,
 		Subject: fmt.Sprintf("Issues %swith your box \"%s\" on opensensemap.org!", resolved, box.Name),
-		Body: fmt.Sprintf("A check at %s identified the following updates for your box \"%s\":\n\n%s%sYou may visit https://opensensemap.org/explore/%s for more details.\n\n--\nSent automatically by osem_notify (https://github.com/noerw/osem_notify)",
+		Body: fmt.Sprintf("A check at %s identified the following updates for your box \"%s\":\n\n%s%sYou may visit https://opensensemap.org/explore/%s for more details.",
 			time.Now().Round(time.Minute), box.Name, errList, resolvedList, box.Id),
 	}
 }

core/osem_api.go

@@ -9,7 +9,7 @@ import (
 )
 
 type OsemError struct {
-	Code    int    `json:"code"`
+	Code    string `json:"code"`
 	Message string `json:"message"`
 }
 

utils/config.go

@@ -3,6 +3,8 @@ package utils
 import (
 	"os"
 	"path"
+	"strconv"
+	"strings"
 
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
@@ -70,3 +72,7 @@ func PrintConfig() {
 func printKV(key, val interface{}) {
 	log.Debugf("%20s: %v", key, val)
 }
+
+func ParseFloat(val string) (float64, error) {
+	return strconv.ParseFloat(strings.TrimSpace(val), 64)
+}