changeset 5115:bb5459faadb7 queued-stage-done

Dont leave old jobs behind if retrying remove jobs.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Wed, 25 Mar 2020 18:02:46 +0100
parents da26076ffafe
children a4c8ed61e4df
files pkg/imports/queue.go
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/pkg/imports/queue.go	Wed Mar 25 17:58:13 2020 +0100
+++ b/pkg/imports/queue.go	Wed Mar 25 18:02:46 2020 +0100
@@ -994,8 +994,7 @@
 				go sendNotificationMail(idj.user, jc.Description(), state, idj.id)
 			}
 
-			switch {
-			case retry:
+			if retry {
 				nid, err := q.addJob(
 					idj.kind,
 					idj.nextDue(),
@@ -1008,7 +1007,8 @@
 				} else {
 					log.Printf("info: re-enqueued job with id %d\n", nid)
 				}
-			case remove:
+			}
+			if remove {
 				if err := deleteJob(ctx, idj.id); err != nil {
 					log.Printf("error: deleting job %d failed: %v\n", idj.id, err)
 				}