diff pkg/controllers/importqueue.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 adf7b9f1273b
children f2204f91d286
line wrap: on
line diff
--- a/pkg/controllers/importqueue.go	Sat Aug 21 15:01:52 2021 +0200
+++ b/pkg/controllers/importqueue.go	Mon Sep 20 17:45:39 2021 +0200
@@ -19,7 +19,6 @@
 	"encoding/csv"
 	"encoding/json"
 	"fmt"
-	"log"
 	"net/http"
 	"strconv"
 	"strings"
@@ -31,6 +30,7 @@
 	"gemma.intevation.de/gemma/pkg/auth"
 	"gemma.intevation.de/gemma/pkg/common"
 	"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"
@@ -251,7 +251,7 @@
 	case err == sql.ErrNoRows:
 		return nil
 	case err != nil:
-		log.Printf("warn: %v\n", err)
+		log.Warnf("%v\n", err)
 		return nil
 	}
 	return &models.ImportTime{Time: when.UTC()}
@@ -283,7 +283,7 @@
 
 	if err := out.Write(record); err != nil {
 		// Too late for HTTP status message.
-		log.Printf("error: %v\n", err)
+		log.Errorf("%v\n", err)
 		return
 	}
 
@@ -291,7 +291,7 @@
 	ctx := req.Context()
 	var rows *sql.Rows
 	if rows, err = conn.QueryContext(ctx, list.stmt.String(), list.args...); err != nil {
-		log.Printf("error: %v\n", err)
+		log.Errorf("%v\n", err)
 		return
 	}
 	defer rows.Close()
@@ -341,10 +341,10 @@
 		if jc := imports.FindJobCreator(imports.JobKind(kind)); jc != nil {
 			job := jc.Create()
 			if err := common.FromJSONString(data, job); err != nil {
-				log.Printf("error: %v\n", err)
+				log.Errorf("%v\n", err)
 			} else if desc, ok := job.(Description); ok {
 				if description, err = desc.Description(); err != nil {
-					log.Printf("error: %v\n", err)
+					log.Errorf("%v\n", err)
 				}
 			}
 		}
@@ -361,18 +361,18 @@
 		record[9] = strings.Replace(description, ",", "|", -1)
 
 		if err := out.Write(record); err != nil {
-			log.Printf("error: %v\n", err)
+			log.Errorf("%v\n", err)
 			return
 		}
 	}
 
 	out.Flush()
 	if err := out.Error(); err != nil {
-		log.Printf("error: %v\n", err)
+		log.Errorf("%v\n", err)
 	}
 
 	if err = rows.Err(); err != nil {
-		log.Printf("error: %v\n", err)
+		log.Errorf("%v\n", err)
 		return
 	}
 }