feat(LogsCollector): support multiple log files (barryvdh#1560)

* feat(LogsCollector): support multiple log files * Add log basename to locate the file * Fix daily driver logging
medneem · Mar 24, 2024 · 4aaf214 · 4aaf214
1 parent d861099
commit 4aaf214
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 15 deletions.
diff --git a/src/DataCollector/LogsCollector.php b/src/DataCollector/LogsCollector.php
@@ -3,6 +3,7 @@
 namespace Barryvdh\Debugbar\DataCollector;
 
 use DebugBar\DataCollector\MessagesCollector;
+use Illuminate\Support\Arr;
 use Psr\Log\LogLevel;
 use ReflectionClass;
 
@@ -14,18 +15,14 @@ public function __construct($path = null, $name = 'logs')
     {
         parent::__construct($name);
 
-        $path = $path ?: $this->getLogsFile();
-        $this->getStorageLogs($path);
-    }
-
-    /**
-     * Get the path to the logs file
-     *
-     * @return string
-     */
-    public function getLogsFile()
-    {
-        return storage_path() . '/logs/laravel.log';
+        $paths = Arr::wrap($path ?: [
+            storage_path('logs/laravel.log'),            
+            storage_path('logs/laravel-' . date('Y-m-d') . '.log'), // for daily driver
+        ]);
+
+        foreach ($paths as $path) {
+            $this->getStorageLogs($path);
+        }
     }
 
     /**
@@ -44,9 +41,16 @@ public function getStorageLogs($path)
 
         //Load the latest lines, guessing about 15x the number of log entries (for stack traces etc)
         $file = implode("", $this->tailFile($path, $this->lines));
+        $basename = basename($path);
 
         foreach ($this->getLogs($file) as $log) {
-            $this->addMessage($log['header'] . $log['stack'], $log['level'], false);
+            $this->messages[] = [
+                'message' => $log['header'] . $log['stack'],
+                'label' => $log['level'],
+                'time' => substr($log['header'], 1, 19),
+                'collector' => $basename,
+                'is_string' => false,
+            ];
         }
     }
 
@@ -115,11 +119,17 @@ public function getLogs($file)
             }
         }
 
-        $log = array_reverse($log);
-
         return $log;
     }
 
+    /**
+     * @return array
+     */
+    public function getMessages()
+    {
+        return array_reverse(parent::getMessages());
+    }
+
     /**
      * Get the log levels from psr/log.
      * Based on https://github.com/mikemand/logviewer/blob/master/src/Kmd/Logviewer/Logviewer.php by mikemand

diff --git a/src/Resources/laravel-debugbar.css b/src/Resources/laravel-debugbar.css
@@ -379,6 +379,11 @@ div.phpdebugbar-widgets-messages li.phpdebugbar-widgets-list-item span.phpdebugb
     color: #333;
 }
 
+div.phpdebugbar-widgets-messages li.phpdebugbar-widgets-list-item span.phpdebugbar-widgets-collector {
+    text-transform: none;
+    color: #888;
+}
+
 .phpdebugbar-widgets-toolbar i.phpdebugbar-fa.phpdebugbar-fa-search {
     position: relative;
     top: -1px;