flush any log context after each operation (#337)

laravel · Jun 30, 2021 · 7c56189 · 7c56189
1 parent 7697ce1
commit 7c56189
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/src/Concerns/ProvidesDefaultConfigurationOptions.php b/src/Concerns/ProvidesDefaultConfigurationOptions.php
@@ -45,6 +45,7 @@ public static function prepareApplicationForNextOperation(): array
             \Laravel\Octane\Listeners\GiveNewApplicationInstanceToValidationFactory::class,
             \Laravel\Octane\Listeners\GiveNewApplicationInstanceToViewFactory::class,
             \Laravel\Octane\Listeners\FlushDatabaseRecordModificationState::class,
+            \Laravel\Octane\Listeners\FlushLogContext::class,
             \Laravel\Octane\Listeners\FlushArrayCache::class,
 
             // First-Party Packages...

diff --git a/src/Listeners/FlushLogContext.php b/src/Listeners/FlushLogContext.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Laravel\Octane\Listeners;
+
+class FlushLogContext
+{
+    /**
+     * Handle the event.
+     *
+     * @param  mixed  $event
+     * @return void
+     */
+    public function handle($event): void
+    {
+        if (! $event->sandbox->resolved('log')) {
+            return;
+        }
+
+        if (method_exists($event->sandbox['log']->driver(), 'withoutContext')) {
+            $event->sandbox['log']->withoutContext();
+        }
+    }
+}