Add delay for retry

lucas34 · Oct 20, 2017 · 52cc2b2 · 52cc2b2
1 parent 55d5349
commit 52cc2b2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/Sources/SwiftQueue/Job.swift b/Sources/SwiftQueue/Job.swift
@@ -101,7 +101,7 @@ public protocol JobResult {
 }
 
 public enum RetryConstraint {
-    case retry
+    case retry(delay: TimeInterval)
     case cancel
     case exponential(initial: TimeInterval)
 }

diff --git a/Sources/SwiftQueue/SwiftQueueJob.swift b/Sources/SwiftQueue/SwiftQueueJob.swift
@@ -203,12 +203,14 @@ internal final class SwiftQueueJob: Operation, JobResult {
             switch retry {
             case .cancel:
                 cancel()
-            case .retry:
+            case .retry(let delay):
                 retries -= 1
-                run()
+                runInBackgroundAfter(delay) {
+                    self.run()
+                }
             case .exponential(let initial):
                 let decimal: NSDecimalNumber = NSDecimalNumber(decimal: Decimal(initial) * pow(2, max(0, runCount - 1)))
-                runInBackgroundAfter(Double(decimal)) {
+                runInBackgroundAfter(TimeInterval(decimal)) {
                     self.retries -= 1
                     self.run()
                 }

diff --git a/Tests/SwiftQueueTests/ConstraintTests.swift b/Tests/SwiftQueueTests/ConstraintTests.swift
@@ -118,7 +118,7 @@ class ConstraintTests: XCTestCase {
         let creator = TestCreator([type: job])
 
         job.result = JobError()
-        job.retryConstraint = .retry
+        job.retryConstraint = .retry(delay: 0)
 
         let manager = SwiftQueueManager(creators: [creator])
         JobBuilder(type: type)

diff --git a/Tests/SwiftQueueTests/TestUtils.swift b/Tests/SwiftQueueTests/TestUtils.swift
@@ -17,7 +17,7 @@ class TestJob: Job {
     public var onCompleteCalled = 0
     public var onCancelCalled = 0
 
-    public var retryConstraint = RetryConstraint.retry
+    public var retryConstraint = RetryConstraint.retry(delay: 0)
 
     public var params: Any?