FIX: Correctly log errors during job initialisation (fixes #316)

symbiote · May 31, 2022 · c370b27 · c370b27
1 parent 84fc3e2
commit c370b27
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/Services/QueuedJobService.php b/src/Services/QueuedJobService.php
@@ -992,7 +992,17 @@ public function runJob($jobId)
                     $this->extend('updateJobDescriptorAndJobOnCompletion', $jobDescriptor, $job);
                 }
             } catch (\Throwable $e) {
-                // PHP 7 Error handling)
+                // If the job failed initialisation $job will be null, so attempt to instantiate it here
+                if ($job === null) {
+                    try {
+                        $impl = $jobDescriptor->Implementation;
+                        /** @var QueuedJob $job */
+                        $job = Injector::inst()->create($impl);
+                    } catch (\Throwable $e) {
+                        // No-op
+                    }
+                }
+
                 $this->handleBrokenJobException($jobDescriptor, $job, $e);
                 $broken = true;
             }