add job data to error call

vapor · Feb 6, 2019 · 8116ca6 · 8116ca6
1 parent 25bfcec
commit 8116ca6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/Sources/Jobs/AnyJob.swift b/Sources/Jobs/AnyJob.swift
@@ -20,6 +20,7 @@ public protocol AnyJob {
     /// - Parameters:
     ///   - context: The context for the job
     ///   - error: The error thrown
+    ///   - storage: The JobStorage
     /// - Returns: A future void, signifying completion
-    func error(_ context: JobContext, _ error: Error) -> EventLoopFuture<Void>
+    func error(_ context: JobContext, _ error: Error, _ storage: JobStorage) -> EventLoopFuture<Void>
 }
diff --git a/Sources/Jobs/Job.swift b/Sources/Jobs/Job.swift
@@ -23,7 +23,7 @@ public protocol Job: AnyJob {
     ///   - context: The JobContext. Can be used to store and retrieve services
     ///   - error: The error returned by the job.
     /// - Returns: A future `Void` value used to signify completion
-    func error(_ context: JobContext, _ error: Error) -> EventLoopFuture<Void>
+    func error(_ context: JobContext, _ error: Error, _ data: Data) -> EventLoopFuture<Void>
 }
 
 public extension Job {
@@ -34,10 +34,19 @@ public extension Job {
     }
 
     /// See `Job.error`
-    func error(_ context: JobContext, _ error: Error) -> EventLoopFuture<Void> {
+    func error(_ context: JobContext, _ error: Error, _ data: Data) -> EventLoopFuture<Void> {
         return context.eventLoop.future()
     }
 
+    func error(_ context: JobContext, _ error: Error, _ storage: JobStorage) -> EventLoopFuture<Void> {
+        do {
+            let data = try JSONDecoder().decode(Data.self, from: storage.data)
+            return self.error(context, error, data)
+        } catch {
+            return context.eventLoop.future(error: error)
+        }
+    }
+
     /// See `AnyJob.anyDequeue`
     public func anyDequeue(_ context: JobContext, _ storage: JobStorage) -> EventLoopFuture<Void> {
         do {

diff --git a/Sources/Jobs/JobsCommand.swift b/Sources/Jobs/JobsCommand.swift
@@ -128,7 +128,7 @@ public class JobsCommand: Command {
                         .persistenceLayer
                         .completed(key: key, jobStorage: jobStorage)
                         .flatMap { _ in
-                            return job.error(jobContext, error)
+                            return job.error(jobContext, error, jobStorage)
                     }
                 }
             }