changeset 5119:5f62ac3db148 queued-stage-done

Don't write "import #42 started" into imports logs and remove the supress code to prevent this in review jobs.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Thu, 26 Mar 2020 13:48:41 +0100
parents 32c1cb94e24a
children 22899babe85d
files pkg/imports/queue.go
diffstat 1 files changed, 1 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- a/pkg/imports/queue.go	Thu Mar 26 13:01:42 2020 +0100
+++ b/pkg/imports/queue.go	Thu Mar 26 13:48:41 2020 +0100
@@ -294,7 +294,7 @@
 func (*reviewedJob) CleanUp() error { return nil }
 
 func (r *reviewedJob) CreateFeedback(int64) Feedback {
-	return &supressFirstLog{logFeedback: logFeedback(r.ID)}
+	return logFeedback(r.ID)
 }
 
 func (rj *reviewedJob) Do(
@@ -737,31 +737,6 @@
 	lf.log("error", format, args...)
 }
 
-type supressFirstLog struct {
-	logFeedback
-	supress bool
-}
-
-func (sfl *supressFirstLog) log(kind, format string, args ...interface{}) {
-	if !sfl.supress {
-		sfl.supress = true
-		return
-	}
-	sfl.logFeedback.log(kind, format, args)
-}
-
-func (sfl *supressFirstLog) Info(format string, args ...interface{}) {
-	sfl.log("info", format, args...)
-}
-
-func (sfl *supressFirstLog) Warn(format string, args ...interface{}) {
-	sfl.log("warn", format, args...)
-}
-
-func (sfl *supressFirstLog) Error(format string, args ...interface{}) {
-	sfl.log("error", format, args...)
-}
-
 func survive(fn func() error) func() error {
 	return func() (err error) {
 		defer func() {
@@ -981,8 +956,6 @@
 				feedback = logFeedback(idj.id)
 			}
 
-			feedback.Info("import #%d started", idj.id)
-
 			ctx := context.Background()
 			var summary interface{}