Merge pull request #395 from msheakoski/catch-job-exception

Clean up when a job triggers an exception

Author: makasim

pkg/job-queue/JobRunner.php

@@ -29,6 +29,8 @@ public function __construct(JobProcessor $jobProcessor, Job $rootJob = null)
      * @param string   $name
      * @param callable $runCallback
      *
+     * @throws \Throwable|\Exception if $runCallback triggers an exception
+     *
      * @return mixed
      */
     public function runUnique($ownerId, $name, callable $runCallback)
@@ -46,7 +48,15 @@ public function runUnique($ownerId, $name, callable $runCallback)
 
         $jobRunner = new self($this->jobProcessor, $rootJob);
 
-        $result = call_user_func($runCallback, $jobRunner, $childJob);
+        try {
+            $result = call_user_func($runCallback, $jobRunner, $childJob);
+        } catch (\Throwable $e) {
+            $this->jobProcessor->failChildJob($childJob);
+            throw $e;
+        } catch (\Exception $e) { // needed to support PHP 5.6
+            $this->jobProcessor->failChildJob($childJob);
+            throw $e;
+        }
 
         if (!$childJob->getStoppedAt()) {
             $result

pkg/job-queue/Tests/JobRunnerTest.php

@@ -163,6 +163,38 @@ public function testRunUniqueShouldFailJobIfCallbackReturnValueIsFalse()
         });
     }
 
+    public function testRunUniqueShouldFailJobIfCallbackThrowsException()
+    {
+        $root = new Job();
+        $child = new Job();
+
+        $jobProcessor = $this->createJobProcessorMock();
+        $jobProcessor
+            ->expects($this->once())
+            ->method('findOrCreateRootJob')
+            ->will($this->returnValue($root))
+        ;
+        $jobProcessor
+            ->expects($this->once())
+            ->method('findOrCreateChildJob')
+            ->will($this->returnValue($child))
+        ;
+        $jobProcessor
+            ->expects($this->never())
+            ->method('successChildJob')
+        ;
+        $jobProcessor
+            ->expects($this->once())
+            ->method('failChildJob')
+        ;
+
+        $jobRunner = new JobRunner($jobProcessor);
+        $this->expectException(\Exception::class);
+        $jobRunner->runUnique('owner-id', 'job-name', function () {
+            throw new \Exception();
+        });
+    }
+
     public function testRunUniqueShouldNotSuccessJobIfJobIsAlreadyStopped()
     {
         $root = new Job();