summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-11-27 17:49:46 +0100
committerGitHub <noreply@github.com>2017-11-27 17:49:46 +0100
commit3e1860e3d612a13d56af0119053f80e025e9ea3d (patch)
tree4af20584f954761224b70d7712d9cc12273f2d50
parent4d200851f9fd54d563bfab090d26d8ebfb163955 (diff)
parent132764bff538b6011801332616bd588b5cf1e039 (diff)
downloadnextcloud-server-3e1860e3d612a13d56af0119053f80e025e9ea3d.tar.gz
nextcloud-server-3e1860e3d612a13d56af0119053f80e025e9ea3d.zip
Merge pull request #7305 from nextcloud/log-level-for-log-extending
Pass log level to log reporters
-rw-r--r--lib/private/Log.php1
-rw-r--r--tests/lib/LoggerTest.php8
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/private/Log.php b/lib/private/Log.php
index a41c728df0d..bed0321bef3 100644
--- a/lib/private/Log.php
+++ b/lib/private/Log.php
@@ -351,6 +351,7 @@ class Log implements ILogger {
$msg = isset($context['message']) ? $context['message'] : 'Exception';
$msg .= ': ' . json_encode($data);
$this->log($level, $msg, $context);
+ $context['level'] = $level;
if (!is_null($this->crashReporters)) {
$this->crashReporters->delegateReport($exception, $context);
}
diff --git a/tests/lib/LoggerTest.php b/tests/lib/LoggerTest.php
index 54336da105c..6f528bd6fab 100644
--- a/tests/lib/LoggerTest.php
+++ b/tests/lib/LoggerTest.php
@@ -90,7 +90,7 @@ class LoggerTest extends TestCase {
$e = new \Exception('test');
$this->registry->expects($this->once())
->method('delegateReport')
- ->with($e, []);
+ ->with($e, ['level' => 3]);
$this->logger->logException($e);
@@ -109,7 +109,7 @@ class LoggerTest extends TestCase {
$e = new \Exception('test');
$this->registry->expects($this->once())
->method('delegateReport')
- ->with($e, []);
+ ->with($e, ['level' => 3]);
$this->logger->logException($e);
@@ -128,7 +128,7 @@ class LoggerTest extends TestCase {
$e = new \Exception('test');
$this->registry->expects($this->once())
->method('delegateReport')
- ->with($e, []);
+ ->with($e, ['level' => 3]);
$this->logger->logException($e);
@@ -147,7 +147,7 @@ class LoggerTest extends TestCase {
$e = new \Exception('test');
$this->registry->expects($this->once())
->method('delegateReport')
- ->with($e, []);
+ ->with($e, ['level' => 3]);
$this->logger->logException($e);