diff pkg/imports/queue.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 4f0869b85038
children 35966741e45e
line wrap: on
line diff
--- a/pkg/imports/queue.go	Sat Aug 21 15:01:52 2021 +0200
+++ b/pkg/imports/queue.go	Mon Sep 20 17:45:39 2021 +0200
@@ -19,7 +19,6 @@
 	"encoding/json"
 	"errors"
 	"fmt"
-	"log"
 	"runtime/debug"
 	"sort"
 	"strings"
@@ -31,6 +30,7 @@
 	"gemma.intevation.de/gemma/pkg/auth"
 	"gemma.intevation.de/gemma/pkg/common"
 	"gemma.intevation.de/gemma/pkg/config"
+	"gemma.intevation.de/gemma/pkg/log"
 	"gemma.intevation.de/gemma/pkg/pgxutils"
 )
 
@@ -381,7 +381,7 @@
 func LogImportKindNames() {
 	kinds := ImportKindNames()
 	sort.Strings(kinds)
-	log.Printf("info: registered import kinds: %s",
+	log.Infof("registered import kinds: %s",
 		strings.Join(kinds, ", "))
 }
 
@@ -440,7 +440,7 @@
 	if idj.waitRetry.Status == pgtype.Present {
 		var d time.Duration
 		if err := idj.waitRetry.AssignTo(&d); err != nil {
-			log.Printf("error: converting waitRetry failed: %v\n", err)
+			log.Errorf("converting waitRetry failed: %v\n", err)
 		} else {
 			now = now.Add(d)
 		}
@@ -462,7 +462,7 @@
 	}
 	d := new(time.Duration)
 	if err := idj.waitRetry.AssignTo(d); err != nil {
-		log.Printf("error: converting waitRetry failed: %v\n", err)
+		log.Errorf("converting waitRetry failed: %v\n", err)
 		return nil
 	}
 	return d
@@ -560,7 +560,7 @@
 				data).Scan(&id)
 
 			if err == nil && sync {
-				log.Printf("info: register wait for %d\n", id)
+				log.Infof("register wait for %d\n", id)
 				done = make(chan struct{})
 				q.waiting[id] = done
 			}
@@ -675,7 +675,7 @@
 	if err != nil {
 		return nil, err
 	}
-	log.Printf("info: add review job %d\n", rID)
+	log.Infof("add review job %d\n", rID)
 	_, err = tx.ExecContext(ctx, updateStateSQL, "reviewed", id)
 	if err != nil && done != nil {
 		go func() {
@@ -741,7 +741,7 @@
 		return err
 	})
 	if err != nil {
-		log.Printf("error: logging failed: %v\n", err)
+		log.Errorf("logging failed: %v\n", err)
 	}
 }
 
@@ -868,7 +868,7 @@
 		if err = auth.RunAs(ctx, queueUser, fn); err == nil || try == maxTries {
 			return err
 		}
-		log.Printf("warn: [try %d/%d] Storing state failed: %v (try again in %s).\n",
+		log.Warnf("[try %d/%d] Storing state failed: %v (try again in %s).\n",
 			try, maxTries, err, sleep)
 
 		time.Sleep(sleep)
@@ -935,7 +935,7 @@
 	// re-enqueue the jobs that are in state running.
 	// They where in progess when the server went down.
 	if err := reEnqueueRunning(); err != nil {
-		log.Printf("error: re-enqueuing failed: %v", err)
+		log.Errorf("re-enqueuing failed: %v", err)
 	}
 
 	for {
@@ -944,7 +944,7 @@
 
 		for {
 			if idj, err = q.fetchJob(); err != nil && err != sql.ErrNoRows {
-				log.Printf("error: db: %v\n", err)
+				log.Errorf("error: db: %v\n", err)
 			}
 			if idj != nil {
 				break
@@ -957,7 +957,7 @@
 			}
 		}
 
-		log.Printf("info: starting import #%d\n", idj.id)
+		log.Infof("starting import #%d\n", idj.id)
 
 		jc := q.jobCreator(idj.kind)
 		if jc == nil {
@@ -978,7 +978,7 @@
 				// Unlock waiting.
 				q.cmdCh <- func(q *importQueue) {
 					if w := q.waiting[idj.id]; w != nil {
-						log.Printf("info: unlock waiting %d\n", idj.id)
+						log.Infof("unlock waiting %d\n", idj.id)
 						if retry {
 							w <- struct{}{}
 						} else {
@@ -1050,9 +1050,9 @@
 			}
 			if !remove {
 				if err := updateStateSummary(ctx, idj.id, state, summary); err != nil {
-					log.Printf("error: setting state of job %d failed: %v\n", idj.id, err)
+					log.Errorf("setting state of job %d failed: %v\n", idj.id, err)
 				}
-				log.Printf("info: import #%d finished: %s\n", idj.id, state)
+				log.Infof("info: import #%d finished: %s\n", idj.id, state)
 			}
 			if idj.sendEmail {
 				go sendNotificationMail(idj.user, jc.Description(), state, idj.id)
@@ -1068,14 +1068,14 @@
 					idj.data,
 					false)
 				if err != nil {
-					log.Printf("error: retry enqueue failed: %v\n", err)
+					log.Errorf("retry enqueue failed: %v\n", err)
 				} else {
-					log.Printf("info: re-enqueued job with id %d\n", nid)
+					log.Infof("re-enqueued job with id %d\n", nid)
 				}
 			}
 			if remove {
 				if err := deleteJob(ctx, idj.id); err != nil {
-					log.Printf("error: deleting job %d failed: %v\n", idj.id, err)
+					log.Errorf("deleting job %d failed: %v\n", idj.id, err)
 				}
 			}
 		}(jc, idj)