Fix log file resolution for stack logging driver (#388)

* Fix log file resolution for stack logging driver

* test: add test for filtering

Signed-off-by: Pushpak Chhajed <[email protected]>

* Optimize log path resolution and simplify daily log file handling code

Signed-off-by: Pushpak Chhajed <[email protected]>

* Fix stack logging driver path resolution

Signed-off-by: Pushpak Chhajed <[email protected]>

* Enhance log entry handling for stack logging configurations

Signed-off-by: Pushpak Chhajed <[email protected]>

* Formatting

Signed-off-by: Pushpak Chhajed <[email protected]>

---------

Signed-off-by: Pushpak Chhajed <[email protected]>
Co-authored-by: Pushpak Chhajed <[email protected]>

Author: sabist

src/Concerns/ReadsLogs.php

@@ -4,6 +4,7 @@
 
 namespace Laravel\Boost\Concerns;
 
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Config;
 
 trait ReadsLogs
@@ -45,11 +46,67 @@ protected function resolveLogFilePath(): string
         $channel = Config::get('logging.default');
         $channelConfig = Config::get("logging.channels.{$channel}");
 
-        if (($channelConfig['driver'] ?? null) === 'daily') {
-            return storage_path('logs/laravel-'.date('Y-m-d').'.log');
+        $channelConfig = $this->resolveChannelWithPath($channelConfig);
+
+        $baseLogPath = Arr::get($channelConfig, 'path', storage_path('logs/laravel.log'));
+
+        if (Arr::get($channelConfig, 'driver') === 'daily') {
+            return $this->resolveDailyLogFilePath($baseLogPath);
+        }
+
+        return $baseLogPath;
+    }
+
+    /**
+     * @param  array<string, mixed>|null  $channelConfig
+     * @return array<string, mixed>|null
+     */
+    protected function resolveChannelWithPath(?array $channelConfig, int $depth = 0): ?array
+    {
+        if ($channelConfig === null || $depth > 2) {
+            return $channelConfig;
         }
 
-        return storage_path('logs/laravel.log');
+        if (isset($channelConfig['path'])) {
+            return $channelConfig;
+        }
+
+        if (($channelConfig['driver'] ?? null) !== 'stack') {
+            return $channelConfig;
+        }
+
+        $firstValidLoggerConfig = collect($channelConfig['channels'] ?? [])
+            ->map(fn (string $name) => Config::get("logging.channels.{$name}"))
+            ->filter(fn ($config): bool => is_array($config))
+            ->map(fn (array $config) => $this->resolveChannelWithPath($config, $depth + 1))
+            ->first(fn (?array $config): bool => isset($config['path']));
+
+        return $firstValidLoggerConfig ?? $channelConfig;
+    }
+
+    protected function resolveDailyLogFilePath(string $basePath): string
+    {
+        $pathInfo = pathinfo($basePath);
+        $directory = $pathInfo['dirname'];
+        $filename = $pathInfo['filename'];
+        $extension = isset($pathInfo['extension']) ? '.'.$pathInfo['extension'] : '';
+
+        $todayLogFile = $directory.DIRECTORY_SEPARATOR.$filename.'-'.date('Y-m-d').$extension;
+
+        if (file_exists($todayLogFile)) {
+            return $todayLogFile;
+        }
+
+        $pattern = $directory.DIRECTORY_SEPARATOR.$filename.'-*'.$extension;
+        $files = glob($pattern) ?: [];
+
+        $datePattern = '/^'.preg_quote($filename, '/').'-\d{4}-\d{2}-\d{2}'.preg_quote($extension, '/').'$/';
+        $latestFile = collect($files)
+            ->filter(fn ($file): int|false => preg_match($datePattern, basename($file)))
+            ->sortDesc()
+            ->first();
+
+        return $latestFile ?? $todayLogFile;
     }
 
     /**
@@ -130,7 +187,7 @@ protected function scanLogChunkForEntries(string $logFile, int $chunkSize): arra
             $offset = max($fileSize - $chunkSize, 0);
             fseek($handle, $offset);
 
-            // If we started mid-line, discard the partial line to align to next newline.
+            // If we started mid-line, discard the partial line to align to the next newline.
             if ($offset > 0) {
                 fgets($handle);
             }