Merge pull request #19241 from nextcloud/bug/noid/job-catch-throwable

Make sure to catch php errors during job execution
This commit is contained in:
Roeland Jago Douma 2020-02-03 09:54:26 +01:00 committed by GitHub
commit 1b33116e8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 1 deletions

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']); $logger->debug('Finished ' . get_class($this) . ' job with ID ' . $this->getId() . ' in ' . $timeTaken . ' seconds', ['app' => 'cron']);
$jobList->setExecutionTime($this, $timeTaken); $jobList->setExecutionTime($this, $timeTaken);
} catch (\Exception $e) { } catch (\Throwable $e) {
if ($logger) { if ($logger) {
$logger->logException($e, [ $logger->logException($e, [
'app' => 'core', 'app' => 'core',

View File

@ -39,6 +39,27 @@ class JobTest extends \Test\TestCase {
$this->assertCount(1, $jobList->getAll()); $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() { public function markRun() {
$this->run = true; $this->run = true;
} }