Browse Source

Merge pull request #50387 from nextcloud/backport/46780/stable30

[stable30] fix(TaskProcessing): Catch JSON encode errors in Manager#setTaskResult
pull/50346/head
Andy Scherzinger 10 months ago
committed by GitHub
parent
commit
baa6739cde
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 8
      lib/private/TaskProcessing/Manager.php

8
lib/private/TaskProcessing/Manager.php

@ -935,7 +935,7 @@ class Manager implements IManager {
$task->setEndedAt(time());
$error = 'The task was processed successfully but the provider\'s output doesn\'t pass validation against the task type\'s outputShape spec and/or the provider\'s own optionalOutputShape spec';
$task->setErrorMessage($error);
$this->logger->error($error, ['exception' => $e]);
$this->logger->error($error . ' Output was: ' . var_export($result, true), ['exception' => $e]);
} catch (NotPermittedException $e) {
$task->setProgress(1);
$task->setStatus(Task::STATUS_FAILED);
@ -952,7 +952,11 @@ class Manager implements IManager {
$this->logger->error($error, ['exception' => $e]);
}
}
$taskEntity = \OC\TaskProcessing\Db\Task::fromPublicTask($task);
try {
$taskEntity = \OC\TaskProcessing\Db\Task::fromPublicTask($task);
} catch (\JsonException $e) {
throw new \OCP\TaskProcessing\Exception\Exception('The task was processed successfully but the provider\'s output could not be encoded as JSON for the database.', 0, $e);
}
try {
$this->taskMapper->update($taskEntity);
$this->runWebhook($task);

Loading…
Cancel
Save