From d5d7fda28a4216e21315800a98e2ad8b66c01a5b Mon Sep 17 00:00:00 2001
From: Tim MacDonald <hello@timacdonald.me>
Date: Tue, 18 Jun 2024 15:45:21 +1000
Subject: [PATCH] Refreshes log manager container

---
 .../ProvidesDefaultConfigurationOptions.php   |  1 +
 ...GiveNewApplicationInstanceToLogManager.php | 22 +++++++++++
 src/OctaneServiceProvider.php                 |  1 +
 ...NewApplicationInstanceToLogManagerTest.php | 37 +++++++++++++++++++
 4 files changed, 61 insertions(+)
 create mode 100644 src/Listeners/GiveNewApplicationInstanceToLogManager.php
 create mode 100644 tests/Listeners/GiveNewApplicationInstanceToLogManagerTest.php

diff --git a/src/Concerns/ProvidesDefaultConfigurationOptions.php b/src/Concerns/ProvidesDefaultConfigurationOptions.php
index 7f9319724..36ebe4101 100644
--- a/src/Concerns/ProvidesDefaultConfigurationOptions.php
+++ b/src/Concerns/ProvidesDefaultConfigurationOptions.php
@@ -35,6 +35,7 @@ public static function prepareApplicationForNextOperation(): array
             \Laravel\Octane\Listeners\GiveNewApplicationInstanceToDatabaseSessionHandler::class,
             \Laravel\Octane\Listeners\GiveNewApplicationInstanceToFilesystemManager::class,
             \Laravel\Octane\Listeners\GiveNewApplicationInstanceToHttpKernel::class,
+            \Laravel\Octane\Listeners\GiveNewApplicationInstanceToLogManager::class,
             \Laravel\Octane\Listeners\GiveNewApplicationInstanceToMailManager::class,
             \Laravel\Octane\Listeners\GiveNewApplicationInstanceToNotificationChannelManager::class,
             \Laravel\Octane\Listeners\GiveNewApplicationInstanceToPipelineHub::class,
diff --git a/src/Listeners/GiveNewApplicationInstanceToLogManager.php b/src/Listeners/GiveNewApplicationInstanceToLogManager.php
new file mode 100644
index 000000000..10a2198c0
--- /dev/null
+++ b/src/Listeners/GiveNewApplicationInstanceToLogManager.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Laravel\Octane\Listeners;
+
+class GiveNewApplicationInstanceToLogManager
+{
+    /**
+     * Handle the event.
+     *
+     * @param  mixed  $event
+     */
+    public function handle($event): void
+    {
+        if (! $event->sandbox->resolved('log')) {
+            return;
+        }
+
+        if (method_exists($log = $event->sandbox->make('log'), 'setApplication')) {
+            $log->setApplication($event->sandbox);
+        }
+    }
+}
diff --git a/src/OctaneServiceProvider.php b/src/OctaneServiceProvider.php
index 92cae6aad..206e32768 100644
--- a/src/OctaneServiceProvider.php
+++ b/src/OctaneServiceProvider.php
@@ -136,6 +136,7 @@ protected function bindListeners()
         $this->app->singleton(Listeners\GiveNewApplicationInstanceToAuthorizationGate::class);
         $this->app->singleton(Listeners\GiveNewApplicationInstanceToBroadcastManager::class);
         $this->app->singleton(Listeners\GiveNewApplicationInstanceToHttpKernel::class);
+        $this->app->singleton(Listeners\GiveNewApplicationInstanceToLogManager::class);
         $this->app->singleton(Listeners\GiveNewApplicationInstanceToMailManager::class);
         $this->app->singleton(Listeners\GiveNewApplicationInstanceToNotificationChannelManager::class);
         $this->app->singleton(Listeners\GiveNewApplicationInstanceToPipelineHub::class);
diff --git a/tests/Listeners/GiveNewApplicationInstanceToLogManagerTest.php b/tests/Listeners/GiveNewApplicationInstanceToLogManagerTest.php
new file mode 100644
index 000000000..03afaa254
--- /dev/null
+++ b/tests/Listeners/GiveNewApplicationInstanceToLogManagerTest.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Laravel\Octane\Tests\Listeners;
+
+use Illuminate\Foundation\Application;
+use Illuminate\Http\Request;
+use Illuminate\Log\Events\MessageLogged;
+use Illuminate\Support\Facades\Context;
+use Illuminate\Support\Facades\Log;
+use Laravel\Octane\Tests\TestCase;
+
+class GiveNewApplicationInstanceToLogManagerTest extends TestCase
+{
+    public function test_context_is_appened_to_logs()
+    {
+        if (! class_exists(Context::class)) {
+            $this->markTestSkipped('Context is not available in this version of Laravel.');
+        }
+        [$app, $worker, $client] = $this->createOctaneContext([
+            Request::create('/', 'GET'),
+        ]);
+        $path = $app['config']->get('logging.channels.single.path');
+        @unlink($path);
+
+        $this->assertFileDoesNotExist($path);
+
+        $app['router']->middleware('web')->get('/', function () {
+            Context::add('foo', 'bar');
+            Log::info('Hello world');
+        });
+
+        $worker->run();
+
+        $this->assertStringContainsString('{"foo":"bar"}', file_get_contents($path),);
+    }
+}
+