adjust tests to new exception log format

Signed-off-by: Robin Appelman <robin@icewind.nl>

1 files changed, 13 insertions, 6 deletions

diff --git a/lib/private/Log.php b/lib/private/Log.php
index 3f6458bbfab..2c2b7ccb08d 100644
--- a/lib/private/Log.php
+++ b/lib/private/Log.php
@@ -265,7 +265,7 @@ class Log implements ILogger {
 		$message = strtr($message, $replace);
 
 		if ($level >= $minLevel) {
-			call_user_func([$this->logger, 'write'], $app, $message, $level);
+			$this->writeLog($app, $message, $level);
 		}
 	}
 
@@ -383,12 +383,10 @@ class Log implements ILogger {
 		array_walk($context, [$this->normalizer, 'format']);
 
 		if ($level >= $minLevel) {
-			if ($this->logger === File::class) {
-				call_user_func([$this->logger, 'write'], $app, $data, $level);
-			} else {
-				$entry = json_encode($data, JSON_PARTIAL_OUTPUT_ON_ERROR);
-				call_user_func([$this->logger, 'write'], $app, $entry, $level);
+			if ($this->logger !== File::class) {
+				$data = json_encode($data, JSON_PARTIAL_OUTPUT_ON_ERROR);
 			}
+			$this->writeLog($app, $data, $level);
 		}
 
 		$context['level'] = $level;
@@ -398,6 +396,15 @@ class Log implements ILogger {
 	}
 
 	/**
+	 * @param string $app
+	 * @param string|array $entry
+	 * @param int $level
+	 */
+	protected function writeLog(string $app, $entry, int $level) {
+		call_user_func([$this->logger, 'write'], $app, $entry, $level);
+	}
+
+	/**
 	 * @param string $logType
 	 * @return string
 	 * @internal