Make sure to catch php errors during job execution

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>

diff --git a/lib/private/BackgroundJob/Job.php b/lib/private/BackgroundJob/Job.php
index 8f11ebb4debe5c3a9c693e7bc1527a5e7e73834f..26c69a2486c56124eda26e14e0197a1deb45c9b2 100644 (file)
--- a/lib/private/BackgroundJob/Job.php
+++ b/lib/private/BackgroundJob/Job.php
@@ -63,7 +63,7 @@ abstract class Job implements IJob {
 
                        $logger->debug('Finished ' . get_class($this) . ' job with ID ' . $this->getId() . ' in ' . $timeTaken . ' seconds', ['app' => 'cron']);
                        $jobList->setExecutionTime($this, $timeTaken);
-               } catch (\Exception $e) {
+               } catch (\Throwable $e) {
                        if ($logger) {
                                $logger->logException($e, [
                                        'app' => 'core',

diff --git a/tests/lib/BackgroundJob/JobTest.php b/tests/lib/BackgroundJob/JobTest.php
index 6e5474e597ce58264f0f5ecc67cc0118791a75a9..b4048aa1c2257ee0c702ae5322e192279364ce98 100644 (file)
--- a/tests/lib/BackgroundJob/JobTest.php
+++ b/tests/lib/BackgroundJob/JobTest.php
@@ -39,6 +39,27 @@ class JobTest extends \Test\TestCase {
                $this->assertCount(1, $jobList->getAll());
        }
 
+       public function testRemoveAfterError() {
+               $jobList = new DummyJobList();
+               $job = new TestJob($this, function () {
+                       $test = null;
+                       $test->someMethod();
+               });
+               $jobList->add($job);
+
+               $logger = $this->getMockBuilder(ILogger::class)
+                       ->disableOriginalConstructor()
+                       ->getMock();
+               $logger->expects($this->once())
+                       ->method('logException')
+                       ->with($this->isInstanceOf(\Throwable::class));
+
+               $this->assertCount(1, $jobList->getAll());
+               $job->execute($jobList, $logger);
+               $this->assertTrue($this->run);
+               $this->assertCount(1, $jobList->getAll());
+       }
+
        public function markRun() {
                $this->run = true;
        }