fix(logging): fix linting and potential double json encoding

t3n · Jul 23, 2024 · 5fb2e35 · 5fb2e35
1 parent 90c336a
commit 5fb2e35
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/Classes/Backend/JSONConsoleLogger.php b/Classes/Backend/JSONConsoleLogger.php
@@ -66,7 +66,7 @@ public function append(string $message, int $severity = LOG_INFO, $additionalDat
                 'datetime' => new \DateTime('now')
             ];
             $output = json_encode($data);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $data = [
                 'severity' => $this->severityLabels[LOG_WARNING],
                 'service' => $this->serviceContext['service'] ?? '',

diff --git a/Classes/ThrowableStorage/ConsoleStorage.php b/Classes/ThrowableStorage/ConsoleStorage.php
@@ -55,10 +55,22 @@ public function logThrowable(\Throwable $throwable, array $additionalData = []):
 
         $serviceContext = $configurationManager->getConfiguration(ConfigurationManager::CONFIGURATION_TYPE_SETTINGS, 't3n.FlowLog.serviceContext');
 
+        /**
+         * If the message is already json encoded, decode it, else use plain message
+         * since we want to ensure that the message is not json encoded twice
+         */
+        json_decode($throwable->getMessage());
+        if (json_last_error() === JSON_ERROR_NONE) {
+            $message = json_decode($throwable->getMessage(), true);
+        } else {
+            $message = $throwable->getMessage();
+        }
+
         $data = [
             'eventTime' => (new \DateTime('now'))->format(DATE_RFC3339),
             'serviceContext' => $serviceContext,
-            'message' => sprintf('PHP Warning: %s' . PHP_EOL . 'Stack trace:' . PHP_EOL . '%s', $throwable->getMessage(), $throwable->getTraceAsString()),
+            'message' => $message,
+            'stackTrace' => $throwable->getTrace(),
             'context' => [
                 'httpRequest' => $this->getHttpRequestContext(),
                 'reportLocation' => [