From 07137b3625d0fb0ae0b8dd49fded3586be3ab874 Mon Sep 17 00:00:00 2001 From: Joseph Beeson Date: Tue, 25 Mar 2025 12:11:28 +0100 Subject: [PATCH 1/3] adjust json parser --- Log/Parser/Piwik.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/Log/Parser/Piwik.php b/Log/Parser/Piwik.php index 1629d3b..cb43fe1 100644 --- a/Log/Parser/Piwik.php +++ b/Log/Parser/Piwik.php @@ -23,7 +23,18 @@ public function parse(Line $line) $message = json_decode($line->content); if (is_object($message)) { - $message->severity = $message->level; + if (property_exists($message, "level_name")){ + $message->severity = $message->level_name; + } + if (property_exists($message, "extra") && property_exists($message->extra, "request_id")){ + $message->requestId = $message->extra->request_id; + } + if (property_exists($message, "extra") && property_exists($message->extra, "class")){ + $message->tag = $message->extra->class; + } + if (property_exists($message, "datetime") && property_exists($message->datetime, "date")){ + $message->datetime = $message->datetime->date; + } return $message; } From a4364cd8e592239ac759e928a11ab0855e6951bf Mon Sep 17 00:00:00 2001 From: Joseph Beeson Date: Tue, 25 Mar 2025 12:37:04 +0100 Subject: [PATCH 2/3] fix logviewer export to tsv --- Log/Parser/Piwik.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Log/Parser/Piwik.php b/Log/Parser/Piwik.php index cb43fe1..c42b6b4 100644 --- a/Log/Parser/Piwik.php +++ b/Log/Parser/Piwik.php @@ -26,16 +26,25 @@ public function parse(Line $line) if (property_exists($message, "level_name")){ $message->severity = $message->level_name; } + $message->requestId = ""; if (property_exists($message, "extra") && property_exists($message->extra, "request_id")){ $message->requestId = $message->extra->request_id; } + $message->tag = ""; if (property_exists($message, "extra") && property_exists($message->extra, "class")){ $message->tag = $message->extra->class; } if (property_exists($message, "datetime") && property_exists($message->datetime, "date")){ $message->datetime = $message->datetime->date; } - return $message; + return array( + 'severity' => $message->severity, + 'tag' => $message->tag, + 'datetime' => $message->datetime, + 'requestId' => $message->requestId, + 'message' => $message->message + ); + } /* From 6685bea4316525ff49353a8fb5812823bb4b6d7f Mon Sep 17 00:00:00 2001 From: Joseph Beeson Date: Tue, 25 Mar 2025 15:53:30 +0100 Subject: [PATCH 3/3] PHPCS --- Log/Parser/Piwik.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Log/Parser/Piwik.php b/Log/Parser/Piwik.php index c42b6b4..0293ce8 100644 --- a/Log/Parser/Piwik.php +++ b/Log/Parser/Piwik.php @@ -23,18 +23,18 @@ public function parse(Line $line) $message = json_decode($line->content); if (is_object($message)) { - if (property_exists($message, "level_name")){ + if (property_exists($message, "level_name")) { $message->severity = $message->level_name; } $message->requestId = ""; - if (property_exists($message, "extra") && property_exists($message->extra, "request_id")){ + if (property_exists($message, "extra") && property_exists($message->extra, "request_id")) { $message->requestId = $message->extra->request_id; } $message->tag = ""; - if (property_exists($message, "extra") && property_exists($message->extra, "class")){ + if (property_exists($message, "extra") && property_exists($message->extra, "class")) { $message->tag = $message->extra->class; } - if (property_exists($message, "datetime") && property_exists($message->datetime, "date")){ + if (property_exists($message, "datetime") && property_exists($message->datetime, "date")) { $message->datetime = $message->datetime->date; } return array( @@ -44,7 +44,6 @@ public function parse(Line $line) 'requestId' => $message->requestId, 'message' => $message->message ); - } /*