Browse Source

Make sure to catch php errors during job execution

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
tags/v19.0.0beta1
Daniel Kesselberg 4 years ago
parent
commit
018020108b
No account linked to committer's email address
2 changed files with 22 additions and 1 deletions
  1. 1
    1
      lib/private/BackgroundJob/Job.php
  2. 21
    0
      tests/lib/BackgroundJob/JobTest.php

+ 1
- 1
lib/private/BackgroundJob/Job.php View File

@@ -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',

+ 21
- 0
tests/lib/BackgroundJob/JobTest.php View File

@@ -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;
}

Loading…
Cancel
Save