Properly parse new log format with dedicated exception field

Signed-off-by: Julius Härtl <[email protected]>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>

Author: juliusknorr

build/main.js

@@ -27,24 +27,24 @@ export class LogEntry extends Component {
 	}
 
 	renderException () {
-		var exceptionData = this.exceptionParser.parse(this.props.message);
+		var exceptionData = this.exceptionParser.parse(this.props.exception ?? this.props.message);
 		return (
 			<Exception {...exceptionData}/>
 		);
 	}
 
 	renderBackgroundException () {
-		var exceptionData = this.exceptionParser.parse(this.props.message);
+		var exceptionData = this.exceptionParser.parse(this.props.exception ?? this.props.message);
 		return (
 			<BackgroundException {...exceptionData}/>
 		);
 	}
 
 	isBackgroundJobException () {
-		return this.exceptionParser.isBackgroundJobException(this.props.message);
+		return this.exceptionParser.isBackgroundJobException(this.props.exception ?? this.props.message);
 	}
 
 	isException () {
-		return this.exceptionParser.isException(this.props.message);
+		return this.exceptionParser.isException(this.props.exception ?? this.props.message);
 	}
 }

build/main.js.map

@@ -70,7 +70,7 @@ export class LogTable extends Component {
 					</td>
 					<td className={style.app}>{entry.app}</td>
 					<td className={style.message}><LogEntry
-						message={entry.message}/></td>
+						message={entry.message} exception={entry.exception}/></td>
 					<td className={style.copy}>
 						<button title={t('logreader', 'Copy')}
 								className="icon icon-clippy" onClick={() => {
@@ -118,7 +118,7 @@ export class LogTable extends Component {
 						className={timeClass + ' ' + style.column}>{this.formatDate(entry, this.props.relative)}</div>
 					<div className={style.message + ' ' + style.column}>
 						<LogEntry
-							message={entry.message}/></div>
+							message={entry.message} exception={entry.exception}/></div>
 				</div>
 			)
 		});

js/Components/LogEntry.js

@@ -73,7 +73,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			$tableItems[] = [
 				self::LEVELS[$logItem['level']],
 				wordwrap($logItem['app'], 18),
-				$this->formatter->formatMessage($logItem['message'], $messageWidth) . "\n",
+				$this->formatter->formatMessage($logItem, $messageWidth) . "\n",
 				$logItem['time']
 			];
 		}

js/Components/LogTable.js

@@ -111,7 +111,7 @@ private function printItem(array $logItem, OutputInterface $output, int $message
 		$parts = [
 			self::LEVELS[$logItem['level']],
 			wordwrap($logItem['app'], 18),
-			$this->formatter->formatMessage($logItem['message'], $messageWidth),
+			$this->formatter->formatMessage($logItem, $messageWidth),
 			$logItem['time'],
 		];
 

lib/Command/Tail.php

@@ -30,12 +30,14 @@ public function __construct(string $root) {
 		$this->root = $root;
 	}
 
-	public function formatMessage($message, int $width) {
-		if (is_array($message) && isset($message['Exception'])) {
-			return $this->formatException($message, $width);
-		} else {
-			return wordwrap($message, $width);
+	public function formatMessage($logItem, int $width) {
+		if (isset($logItem['exception'])) {
+			return $this->formatException($logItem['exception'], $width);
+		}
+		if (is_array($logItem['message']) && isset($logItem['message']['Exception'])) {
+			return $this->formatException($logItem['message'], $width);
 		}
+		return wordwrap($logItem['message'], $width);
 	}
 
 	private function formatException(array $e, int $width) {