diff pkg/controllers/report.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 699048c86848
children bbc257dd9abf
line wrap: on
line diff
--- a/pkg/controllers/report.go	Sat Aug 21 15:01:52 2021 +0200
+++ b/pkg/controllers/report.go	Mon Sep 20 17:45:39 2021 +0200
@@ -16,7 +16,6 @@
 import (
 	"database/sql"
 	"fmt"
-	"log"
 	"net/http"
 	"os"
 	"path/filepath"
@@ -27,6 +26,7 @@
 	"gemma.intevation.de/gemma/pkg/middleware"
 	"gemma.intevation.de/gemma/pkg/xlsx"
 
+	"gemma.intevation.de/gemma/pkg/log"
 	mw "gemma.intevation.de/gemma/pkg/middleware"
 
 	"github.com/gorilla/mux"
@@ -47,7 +47,7 @@
 
 	dir, err := os.Open(path)
 	if err != nil {
-		log.Printf("error: %v\n", err)
+		log.Errorf("%v\n", err)
 		err = mw.JSONError{
 			Code:    http.StatusInternalServerError,
 			Message: "Listing report templates failed.",
@@ -57,7 +57,7 @@
 	defer dir.Close()
 	files, err := dir.Readdirnames(-1)
 	if err != nil {
-		log.Printf("error: %v\n", err)
+		log.Errorf("%v\n", err)
 		err = mw.JSONError{
 			Code:    http.StatusInternalServerError,
 			Message: "Listing report templates failed.",
@@ -110,15 +110,15 @@
 
 	if stat, err := os.Stat(path); err != nil {
 		if os.IsNotExist(err) {
-			log.Printf("error: report dir '%s' does not exists.\n", path)
+			log.Errorf("report dir '%s' does not exists.\n", path)
 			http.NotFound(rw, req)
 		} else {
-			log.Printf("error: %v\n", err)
+			log.Errorf("%v\n", err)
 			http.Error(rw, "Error: "+err.Error(), http.StatusInternalServerError)
 		}
 		return
 	} else if !stat.Mode().IsDir() {
-		log.Printf("error: report dir '%s' is not a directory.\n", path)
+		log.Errorf("report dir '%s' is not a directory.\n", path)
 		http.NotFound(rw, req)
 		return
 	}
@@ -134,7 +134,7 @@
 			if os.IsNotExist(err) {
 				http.NotFound(rw, req)
 			} else {
-				log.Printf("error: %v\n", err)
+				log.Errorf("%v\n", err)
 				http.Error(rw, "Error: "+err.Error(), http.StatusInternalServerError)
 			}
 			return
@@ -143,7 +143,7 @@
 
 	template, err := excelize.OpenFile(xlsxFilename)
 	if err != nil {
-		log.Printf("error: %v\n", err)
+		log.Errorf("%v\n", err)
 		http.Error(rw, "Error: "+err.Error(), http.StatusInternalServerError)
 		return
 	}
@@ -151,7 +151,7 @@
 	action, err := xlsx.ActionFromFile(yamlFilename)
 	if err != nil {
 		http.Error(rw, "Error: "+err.Error(), http.StatusInternalServerError)
-		log.Printf("error: %v\n", err)
+		log.Errorf("%v\n", err)
 		return
 	}
 
@@ -162,7 +162,7 @@
 	defer tx.Rollback()
 
 	if err := action.Execute(ctx, tx, template); err != nil {
-		log.Printf("error: %v\n", err)
+		log.Errorf("%v\n", err)
 		http.Error(rw, "Error: "+err.Error(), http.StatusInternalServerError)
 		return
 	}
@@ -174,6 +174,6 @@
 		"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
 
 	if _, err := template.WriteTo(rw); err != nil {
-		log.Printf("error: %v\n", err)
+		log.Errorf("%v\n", err)
 	}
 }