diff pkg/middleware/jsonhandler.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 f4ec3558460e
children 6270951dda28
line wrap: on
line diff
--- a/pkg/middleware/jsonhandler.go	Sat Aug 21 15:01:52 2021 +0200
+++ b/pkg/middleware/jsonhandler.go	Mon Sep 20 17:45:39 2021 +0200
@@ -19,12 +19,12 @@
 	"encoding/json"
 	"fmt"
 	"io"
-	"log"
 	"net/http"
 
 	"github.com/jackc/pgx"
 
 	"gemma.intevation.de/gemma/pkg/auth"
+	"gemma.intevation.de/gemma/pkg/log"
 )
 
 // JSONResult defines the return type of JSONHandler handler function.
@@ -137,7 +137,7 @@
 	}
 
 	if err != nil {
-		log.Printf("error: %v\n", err)
+		log.Errorf("%v\n", err)
 		switch e := err.(type) {
 		case pgx.PgError:
 			var res = struct {
@@ -152,7 +152,7 @@
 			rw.Header().Set("Content-Type", "application/json")
 			rw.WriteHeader(http.StatusInternalServerError)
 			if err := json.NewEncoder(rw).Encode(&res); err != nil {
-				log.Printf("error: %v\n", err)
+				log.Errorf("%v\n", err)
 			}
 		case JSONError:
 			rw.Header().Set("Content-Type", "application/json")
@@ -166,7 +166,7 @@
 				Message: e.Message,
 			}
 			if err := json.NewEncoder(rw).Encode(&res); err != nil {
-				log.Printf("error: %v\n", err)
+				log.Errorf("%v\n", err)
 			}
 		default:
 			http.Error(rw,
@@ -194,7 +194,7 @@
 			err = json.NewEncoder(rw).Encode(jr.Result)
 		}
 		if err != nil {
-			log.Printf("error: %v\n", err)
+			log.Errorf("%v\n", err)
 		}
 	}
 }
@@ -206,6 +206,6 @@
 	rw.Header().Set("X-Content-Type-Options", "nosniff")
 	rw.WriteHeader(code)
 	if err := json.NewEncoder(rw).Encode(data); err != nil {
-		log.Printf("error: %v\n", err)
+		log.Errorf("%v\n", err)
 	}
 }