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

Upgrade features
JackieDo · Apr 9, 2020 · f013c00 · f013c00
2 parents 9acf462 + 076af1b
commit f013c00
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -10,13 +10,13 @@
         }
     ],
     "require": {
-        "illuminate/cache": "5.*",
-        "illuminate/config": "5.*",
-        "illuminate/console": "5.*",
-        "illuminate/http": "5.*",
-        "illuminate/pagination": "5.*",
-        "illuminate/support": "5.*",
-        "nesbot/carbon": "~1.20 || ^2.0"
+        "illuminate/cache": "^6.0|5.*",
+        "illuminate/config": "^6.0|5.*",
+        "illuminate/console": "^6.0|5.*",
+        "illuminate/http": "^6.0|5.*",
+        "illuminate/pagination": "^6.0|5.*",
+        "illuminate/support": "^6.0|5.*",
+        "nesbot/carbon": "^2.0|~1.20"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Jackiedo/LogReader/LogParser.php b/src/Jackiedo/LogReader/LogParser.php
@@ -15,7 +15,7 @@ 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})?([^\s\']+)(\'{1}|\:)\s+)?";
+    const CONTEXT_EXCEPTION_PATTERN   = "((exception\s\')?([^\s\']+)(\'|\:)\s+)?";
     const CONTEXT_MESSAGE_PATTERN     = "(with\smessage\s)?(.*)?";
     const CONTEXT_IN_PATTERN          = "\sin\s(.*)\:(\d+)";
     const STACK_TRACE_DIVIDER_PATTERN = "(\[stacktrace\]|Stack trace\:)";
@@ -88,10 +88,12 @@ public function parseLogContext($content)
 
         $exception = isset($matchs[1]) ? $matchs[3] : null;
         $message   = isset($matchs[6]) ? $matchs[6] : $content;
-        $message   = trim($message, "'");
         $in        = isset($matchs[7]) ? $matchs[7] : null;
         $line      = isset($matchs[8]) ? $matchs[8] : null;
 
+        // Strip quote chars from the beginning and end of message
+        $message = preg_match("/^\'(.*)\'$/ms", $message, $matchQuote) ? $matchQuote[1] : $message;
+
         return compact('message', 'exception', 'in', 'line');
     }
 

diff --git a/src/Jackiedo/LogReader/LogReader.php b/src/Jackiedo/LogReader/LogReader.php
@@ -128,6 +128,16 @@ public function __construct(Cache $cache, Config $config, Request $request)
         $this->levelable = new Levelable;
         $this->parser    = new LogParser;
 
+        $defaultParserClass = $this->config->get('log-reader.default_log_parser', null);
+
+        if (class_exists($defaultParserClass)) {
+            $logParser = new $defaultParserClass;
+
+            if ($logParser instanceof LogParserInterface) {
+                $this->parser = new $logParser;
+            }
+        }
+
         $this->setLogPath($this->config->get('log-reader.path', storage_path('logs')));
         $this->setLogFilename($this->config->get('log-reader.filename', 'laravel.log'));
         $this->setEnvironment($this->config->get('log-reader.environment'));

diff --git a/src/config/config.php b/src/config/config.php
@@ -74,6 +74,20 @@
     |
     */
 
-    'order_by_direction' => 'asc'
+    'order_by_direction' => 'asc',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default log parser
+    |--------------------------------------------------------------------------
+    |
+    | This is the default class used to parse log entries.
+    |
+    | If this setting is not set, the 'Jackiedo\LogReader\LogParser' class will
+    | be used.
+    |
+    */
+
+    'default_log_parser' => null
 
 );