wait for either context or taskchan

sonroyaalmerol · Nov 18, 2024 · 3c8c962 · 3c8c962
1 parent 3ba429e
commit 3c8c962
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/internal/backend/backup/jobrun.go b/internal/backend/backup/jobrun.go
@@ -142,7 +142,11 @@ func RunBackup(job *store.Job, storeInstance *store.Store, waitChan chan struct{
 	}
 
 	log.Printf("Waiting for task: %s\n", job.ID)
-	<-taskChan
+
+	select {
+	case <-taskChan:
+	case <-watchCtx.Done():
+	}
 
 	if task == nil {
 		return nil, fmt.Errorf("RunBackup: task not found")