Merge pull request #235 from opcodesio/octane-fix

potential fix for Octane inconsistent state
opcodesio · Jun 21, 2023 · 5ed339d · 5ed339d
2 parents 20b547a + eb454b1
commit 5ed339d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/src/LogReader.php b/src/LogReader.php
@@ -60,6 +60,11 @@ public static function clearInstance(LogFile $file): void
         }
     }
 
+    public static function clearInstances(): void
+    {
+        self::$_instances = [];
+    }
+
     public function index(): LogIndex
     {
         return $this->file->index($this->query);

diff --git a/src/LogViewerServiceProvider.php b/src/LogViewerServiceProvider.php
@@ -9,6 +9,7 @@
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Str;
+use Laravel\Octane\Events\RequestTerminated;
 use Opcodes\LogViewer\Console\Commands\GenerateDummyLogsCommand;
 use Opcodes\LogViewer\Console\Commands\PublishCommand;
 use Opcodes\LogViewer\Events\LogFileDeleted;
@@ -62,6 +63,7 @@ public function boot()
         $this->defineAssetPublishing();
         $this->defineDefaultGates();
         $this->configureMiddleware();
+        $this->resetStateAfterOctaneRequest();
 
         Event::listen(LogFileDeleted::class, function (LogFileDeleted $event) {
             LogViewer::clearFileCache();
@@ -135,7 +137,14 @@ protected function configureMiddleware(): void
         $kernel->prependToMiddlewarePriority(EnsureFrontendRequestsAreStateful::class);
     }
 
-    private function isEnabled(): bool
+    protected function resetStateAfterOctaneRequest()
+    {
+        $this->app['events']->listen(RequestTerminated::class, function ($event) {
+            LogReader::clearInstances();
+        });
+    }
+
+    protected function isEnabled(): bool
     {
         return (bool) $this->app['config']->get("{$this->name}.enabled", true);
     }

diff --git a/tests/Unit/LogIndex/ChunkDefinitionsTest.php b/tests/Unit/LogIndex/ChunkDefinitionsTest.php
@@ -95,7 +95,7 @@
     expect($cachedMetadata)->toHaveKey('chunk_definitions')
         ->and($cachedMetadata['chunk_definitions'])->toBeArray()->toHaveCount(1)
         ->and($cachedMetadata['chunk_definitions'][0])
-            ->toBe($logIndex->getChunkDefinition(0));
+        ->toBe($logIndex->getChunkDefinition(0));
 
     // after adding a new log entry, the cache won't be updated until calling the –>save() method.
     $logIndex->addToIndex(3500, now(), 'info');
@@ -109,7 +109,7 @@
     expect($updatedCachedMetadata)->not->toBe($cachedMetadata)
         ->toHaveKey('current_chunk_definition')
         ->and($updatedCachedMetadata['current_chunk_definition'])
-            ->toBe($logIndex->getChunkDefinition(1));
+        ->toBe($logIndex->getChunkDefinition(1));
 });
 
 it('keeps the chunk definitions after re-instantiating the log index', function () {