Merge pull request #30 from JackieDo/version-2.x

Update log parser
JackieDo · Apr 8, 2020 · 8295c49 · 8295c49
2 parents 5417c68 + c08b69d
commit 8295c49
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Jackiedo/LogReader/Entities/LogEntry.php b/src/Jackiedo/LogReader/Entities/LogEntry.php
@@ -296,7 +296,7 @@ protected function setLevel($level = null)
     protected function setFilePath($path = null)
     {
         if ($path) {
-            $this->file_path = $path;
+            $this->file_path = realpath($path);
         }
     }
 

diff --git a/src/Jackiedo/LogReader/LogParser.php b/src/Jackiedo/LogReader/LogParser.php
@@ -15,8 +15,8 @@ class LogParser implements LogParserInterface
     const LOG_DATE_PATTERN            = "\[(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})\]";
     const LOG_ENVIRONMENT_PATTERN     = "(\w+)";
     const LOG_LEVEL_PATTERN           = "([A-Z]+)";
-    const CONTEXT_EXCEPTION_PATTERN   = "exception\s\'{1}([^\']+)\'{1}";
-    const CONTEXT_MESSAGE_PATTERN     = "(\swith\smessage\s\'{1}(.*)\'{1})?";
+    const CONTEXT_EXCEPTION_PATTERN   = "((exception\s\'{1})?([^\s\']+)(\'{1}|\:)\s+)?";
+    const CONTEXT_MESSAGE_PATTERN     = "(with\smessage\s)?(.*)?";
     const CONTEXT_IN_PATTERN          = "\sin\s(.*)\:(\d+)";
     const STACK_TRACE_DIVIDER_PATTERN = "(\[stacktrace\]|Stack trace\:)";
     const STACK_TRACE_INDEX_PATTERN   = "\#\d+\s";