mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7305 from nextcloud/log-level-for-log-extending 

Pass log level to log reporters
This commit is contained in:
Morris Jobke 2017-11-27 17:49:46 +01:00 committed by GitHub
parent 4d200851f9 132764bff5
commit 3e1860e3d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/private/Log.php
View File

@ -351,6 +351,7 @@ class Log implements ILogger {
$msg = isset($context['message']) ? $context['message'] : 'Exception'; $msg = isset($context['message']) ? $context['message'] : 'Exception';
$msg .= ': ' . json_encode($data); $msg .= ': ' . json_encode($data);
$this->log($level, $msg, $context); $this->log($level, $msg, $context);
$context['level'] = $level;
if (!is_null($this->crashReporters)) { if (!is_null($this->crashReporters)) {
$this->crashReporters->delegateReport($exception, $context); $this->crashReporters->delegateReport($exception, $context);
} }

8
tests/lib/LoggerTest.php
View File

@ -90,7 +90,7 @@ class LoggerTest extends TestCase {
$e = new \Exception('test'); $e = new \Exception('test');
$this->registry->expects($this->once()) $this->registry->expects($this->once())
->method('delegateReport') ->method('delegateReport')
->with($e, []); ->with($e, ['level' => 3]);
$this->logger->logException($e); $this->logger->logException($e);
@ -109,7 +109,7 @@ class LoggerTest extends TestCase {
$e = new \Exception('test'); $e = new \Exception('test');
$this->registry->expects($this->once()) $this->registry->expects($this->once())
->method('delegateReport') ->method('delegateReport')
->with($e, []); ->with($e, ['level' => 3]);
$this->logger->logException($e); $this->logger->logException($e);
@ -128,7 +128,7 @@ class LoggerTest extends TestCase {
$e = new \Exception('test'); $e = new \Exception('test');
$this->registry->expects($this->once()) $this->registry->expects($this->once())
->method('delegateReport') ->method('delegateReport')
->with($e, []); ->with($e, ['level' => 3]);
$this->logger->logException($e); $this->logger->logException($e);
@ -147,7 +147,7 @@ class LoggerTest extends TestCase {
$e = new \Exception('test'); $e = new \Exception('test');
$this->registry->expects($this->once()) $this->registry->expects($this->once())
->method('delegateReport') ->method('delegateReport')
->with($e, []); ->with($e, ['level' => 3]);
$this->logger->logException($e); $this->logger->logException($e);