diff options
| -rw-r--r-- | lib/private/backgroundjob/job.php | 6 | ||||
| -rw-r--r-- | lib/private/log.php | 4 | ||||
| -rw-r--r-- | lib/public/ilogger.php | 8 | ||||
| -rw-r--r-- | tests/lib/backgroundjob/job.php | 3 |
4 files changed, 15 insertions, 6 deletions
diff --git a/lib/private/backgroundjob/job.php b/lib/private/backgroundjob/job.php index d666cfe085e..e7268894848 100644 --- a/lib/private/backgroundjob/job.php +++ b/lib/private/backgroundjob/job.php @@ -52,8 +52,10 @@ abstract class Job implements IJob { $this->run($this->argument); } catch (\Exception $e) { if ($logger) { - $logger->error('Error while running background job (class: ' . get_class($this) . ', arguments: ' . print_r($this->argument, true) . ')'); - $logger->logException($e); + $logger->logException($e, [ + 'app' => 'core', + 'message' => 'Error while running background job (class: ' . get_class($this) . ', arguments: ' . print_r($this->argument, true) . ')' + ]); } } } diff --git a/lib/private/log.php b/lib/private/log.php index 6c1666a9d7f..addefe6e53d 100644 --- a/lib/private/log.php +++ b/lib/private/log.php @@ -285,6 +285,8 @@ class Log implements ILogger { 'Line' => $exception->getLine(), ); $exception['Trace'] = preg_replace('!(login|checkPassword)\(.*\)!', '$1(*** username and password replaced ***)', $exception['Trace']); - $this->error('Exception: ' . json_encode($exception), $context); + $msg = isset($context['message']) ? $context['message'] : 'Exception'; + $msg .= ': ' . json_encode($exception); + $this->error($msg, $context); } } diff --git a/lib/public/ilogger.php b/lib/public/ilogger.php index 368b25ab693..2a727697a6a 100644 --- a/lib/public/ilogger.php +++ b/lib/public/ilogger.php @@ -125,6 +125,14 @@ interface ILogger { /** * Logs an exception very detailed + * An additional message can we written to the log by adding it to the + * context. + * + * <code> + * $logger->logException($ex, [ + * 'message' => 'Exception during cron job execution' + * ]); + * </code> * * @param \Exception $exception * @param array $context diff --git a/tests/lib/backgroundjob/job.php b/tests/lib/backgroundjob/job.php index 75b4865819a..12413e2c52a 100644 --- a/tests/lib/backgroundjob/job.php +++ b/tests/lib/backgroundjob/job.php @@ -28,9 +28,6 @@ class Job extends \Test\TestCase { ->disableOriginalConstructor() ->getMock(); $logger->expects($this->once()) - ->method('error') - ->with('Error while running background job (class: Test\BackgroundJob\TestJob, arguments: )'); - $logger->expects($this->once()) ->method('logException') ->with($e); |