diff pkg/controllers/system.go @ 5490:5f47eeea988d logging

Use own logging package.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Mon, 20 Sep 2021 17:45:39 +0200
parents 24156a964eaa
children 31973f6f5cca
line wrap: on
line diff
--- a/pkg/controllers/system.go	Sat Aug 21 15:01:52 2021 +0200
+++ b/pkg/controllers/system.go	Mon Sep 20 17:45:39 2021 +0200
@@ -19,7 +19,6 @@
 	"database/sql"
 	"fmt"
 	"io/ioutil"
-	"log"
 	"net/http"
 	"regexp"
 	"strings"
@@ -33,6 +32,7 @@
 	"gemma.intevation.de/gemma/pkg/config"
 	"gemma.intevation.de/gemma/pkg/geoserver"
 	"gemma.intevation.de/gemma/pkg/imports"
+	"gemma.intevation.de/gemma/pkg/log"
 	"gemma.intevation.de/gemma/pkg/models"
 
 	mw "gemma.intevation.de/gemma/pkg/middleware"
@@ -197,7 +197,7 @@
 	styles := strings.Split(which, ",")
 
 	doBoth := func(req *http.Request) {
-		log.Printf("info: Trigger re-calculation of %s.", which)
+		log.Infof("trigger re-calculation of %s.", which)
 		for _, style := range styles {
 			geoserver.ReconfigureStyle(style)
 		}
@@ -210,7 +210,7 @@
 
 	oldCVs, err := models.ParseColorValues(old.String)
 	if err != nil {
-		log.Printf("warn: old config value is broken: %v\n", err)
+		log.Warnf("old config value is broken: %v\n", err)
 		return doBoth, nil
 	}
 
@@ -231,7 +231,7 @@
 
 	// Only the color changed -> no expensive recalc needed.
 	if colorChanged {
-		log.Println("info: Only colors changed.")
+		log.Infof("only colors changed.")
 		return func(*http.Request) {
 			for _, style := range styles {
 				geoserver.ReconfigureStyle(style)
@@ -287,7 +287,7 @@
 	job := &imports.IsoRefresh{ClassBreaks: breaks}
 	serialized, err := common.ToJSONString(job)
 	if err != nil {
-		log.Printf("error: %v\n", err)
+		log.Errorf("%v\n", err)
 		return
 	}
 	var jobID int64
@@ -300,11 +300,11 @@
 		false,
 		serialized,
 	); err != nil {
-		log.Printf("error: %v\n", err)
+		log.Errorf("%v\n", err)
 		return
 	}
-	log.Printf(
-		"info: Recalculate sounding results contours in job %d.\n",
+	log.Infof(
+		"recalculate sounding results contours in job %d.\n",
 		jobID)
 
 }
@@ -319,7 +319,7 @@
 			return err
 		},
 	); err != nil {
-		log.Printf("error: Cleaning sounding diffs cache failed: %v\n", err)
+		log.Errorf("cleaning sounding diffs cache failed: %v\n", err)
 	}
 }