Deadline now cancel the job properly (#98)

Author: lucas34

CHANGELOG.md

@@ -12,6 +12,7 @@
 - Change signature of Limit(Int) to Limit(Double)
 
 #### Fix 
+- Deadline now cancel the job properly (#98)
 - Fix calling `done` after termination will remove the lastError (#97)
 - Breaking support for Swift 3.2 (#75)
 

Sources/SwiftQueue/Constrains+Deadline.swift

@@ -15,11 +15,16 @@ internal final class DeadlineConstraint: JobConstraint {
     }
 
     func run(operation: SqOperation) -> Bool {
-        if let delay = operation.info.deadline {
-            runInBackgroundAfter(delay.timeIntervalSince(Date()), callback: { [weak operation] in
-                operation?.run()
-            })
+        guard let delay = operation.info.deadline else {
+            return true
         }
+
+        runInBackgroundAfter(delay.timeIntervalSince(Date()), callback: { [weak operation] in
+            guard let ope = operation else { return }
+            guard !ope.isFinished else { return }
+
+            ope.cancel(with: .deadline)
+        })
         return true
     }
 

Sources/SwiftQueue/SqOperation.swift

@@ -66,6 +66,12 @@ internal final class SqOperation: Operation {
         super.cancel()
     }
 
+    func cancel(with: SwiftQueueError) {
+        lastError = with
+        onTerminate()
+        super.cancel()
+    }
+
     func onTerminate() {
         if isExecuting {
             isFinished = true