# HG changeset patch
# User Sascha L. Teichmann <teichmann@intevation.de>
# Date 1539965366 -7200
# Node ID 3841509f6e9e6dbfeac27781006c1cc5cf9b241e
# Parent  c34a2a643f5e7fb6e91d10840f21ed370891186f
Store job id alongside to job in job queue.

diff -r c34a2a643f5e -r 3841509f6e9e pkg/imports/queue.go
--- a/pkg/imports/queue.go	Fri Oct 19 16:39:05 2018 +0200
+++ b/pkg/imports/queue.go	Fri Oct 19 18:09:26 2018 +0200
@@ -17,6 +17,11 @@
 	CleanUp() error
 }
 
+type idJob struct {
+	id  int64
+	job Job
+}
+
 var (
 	queueCond = sync.NewCond(new(sync.Mutex))
 	queue     = list.New()
@@ -32,26 +37,28 @@
 	id := atomic.AddInt64(&jobID, 1)
 	queueCond.L.Lock()
 	defer queueCond.L.Unlock()
-	queue.PushBack(job)
+	queue.PushBack(idJob{id, job})
 	queueCond.Signal()
 	return id
 }
 
 func importLoop() {
 	for {
-		var job Job
+		var idj idJob
 		queueCond.L.Lock()
 		for queue.Len() == 0 {
 			queueCond.Wait()
 		}
-		job = queue.Remove(queue.Front()).(Job)
+		idj = queue.Remove(queue.Front()).(idJob)
 		queueCond.L.Unlock()
 
-		if err := auth.RunAs(job.User(), context.Background(), job.Do); err != nil {
-			log.Printf("import error: %v\n", err)
+		log.Printf("starting import job %d\n", idj.id)
+
+		if err := auth.RunAs(idj.job.User(), context.Background(), idj.job.Do); err != nil {
+			log.Printf("import error (job %d): %v\n", idj.id, err)
 		}
-		if err := job.CleanUp(); err != nil {
-			log.Printf("cleanup error: %v\n", err)
+		if err := idj.job.CleanUp(); err != nil {
+			log.Printf("cleanup error (job %d): %v\n", idj.id, err)
 		}
 	}
 }