Removed previous exception from logstash (#18)

JBZoo · Aug 16, 2023 · a0da5cd · a0da5cd
1 parent cf71756
commit a0da5cd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 30 deletions.
diff --git a/src/OutputMods/Logstash.php b/src/OutputMods/Logstash.php
@@ -74,7 +74,15 @@ public function onExecException(\Exception $exception): void
         $this->logger->log(
             Level::Critical,
             'Command Exception: ' . $exception->getMessage(),
-            $this->prepareContext(['error' => self::exceptionToLog($exception)]),
+            $this->prepareContext([
+                'error' => [
+                    'type'        => \get_class($exception),
+                    'code'        => $exception->getCode(),
+                    'message'     => $exception->getMessage(),
+                    'file'        => $exception->getFile() . ':' . $exception->getLine(),
+                    'stack_trace' => $exception->getTraceAsString(),
+                ],
+            ]),
         );
     }
 
@@ -132,32 +140,4 @@ protected function prepareContext(array $context): array
 
         return parent::prepareContext($newContext);
     }
-
-    private static function exceptionToLog(?\Throwable $exception): ?array
-    {
-        static $deepCounter = 0;
-
-        if ($exception === null) {
-            return null;
-        }
-
-        $maxExceptionDeepLevel = 5;
-        $deepCounter++;
-
-        if ($deepCounter === $maxExceptionDeepLevel) {
-            return [
-                'message'  => $exception->getMessage(),
-                'previous' => 'too deep',
-            ];
-        }
-
-        return [
-            'type'        => \get_class($exception),
-            'code'        => $exception->getCode(),
-            'message'     => $exception->getMessage(),
-            'file'        => $exception->getFile() . ':' . $exception->getLine(),
-            'stack_trace' => $exception->getTraceAsString(),
-            'previous'    => self::exceptionToLog($exception->getPrevious()),
-        ];
-    }
 }
diff --git a/tests/CliOutputLogstashTest.php b/tests/CliOutputLogstashTest.php
@@ -164,7 +164,6 @@ public function testFormatOfMessageException(): void
                     'message'     => 'string',
                     'file'        => 'string',
                     'stack_trace' => 'string',
-                    'previous'    => 'NULL',
                 ],
             ],
         ], $lineStruture);