♻️ Resolve busy-loop on worker

Signed-off-by: Rintaro Okamura <[email protected]>
vdaas · Apr 20, 2020 · 58d9ed3 · 58d9ed3
1 parent 7017111
commit 58d9ed3
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/internal/worker/queue.go b/internal/worker/queue.go
@@ -132,10 +132,6 @@ func (q *queue) pop(ctx context.Context, retry uint64) (JobFunc, error) {
 		return nil, errors.ErrQueueIsNotRunning()
 	}
 
-	if retry == 0 {
-		return nil, errors.ErrJobFuncIsNil()
-	}
-
 	select {
 	case <-ctx.Done():
 		return nil, ctx.Err()
@@ -144,6 +140,11 @@ func (q *queue) pop(ctx context.Context, retry uint64) (JobFunc, error) {
 			return job, nil
 		}
 	}
+
+	if retry <= 0 {
+		return nil, errors.ErrJobFuncIsNil()
+	}
+
 	retry--
 	return q.pop(ctx, retry)
 }