Removes shutdown handler (#211)

Author: nunomaduro

bin/swoole-server

@@ -3,7 +3,6 @@
 
 use Laravel\Octane\RequestContext;
 use Laravel\Octane\Swoole\Handlers\OnManagerStart;
-use Laravel\Octane\Swoole\Handlers\OnServerShutdown;
 use Laravel\Octane\Swoole\Handlers\OnServerStart;
 use Laravel\Octane\Swoole\Handlers\OnWorkerStart;
 use Laravel\Octane\Swoole\ServerStateFile;
@@ -162,8 +161,4 @@ $server->on('workerstop', function () use ($workerState) {
     $workerState->worker->terminate();
 });
 
-$server->on('shutdown', fn () => (new OnServerShutdown(
-    new ServerStateFile($serverStateFile)
-))());
-
 $server->start();

src/Exec.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Laravel\Octane;
+
+class Exec
+{
+    /**
+     * Run the given command.
+     *
+     * @param  string  $command
+     * @return array
+     */
+    public function run($command)
+    {
+        exec($command, $output);
+
+        return $output;
+    }
+}

src/OctaneServiceProvider.php

@@ -60,6 +60,7 @@ public function register()
             return new SwooleServerProcessInspector(
                 $app->make(SignalDispatcher::class),
                 $app->make(SwooleServerStateFile::class),
+                $app->make(Exec::class),
             );
         });
 

src/Swoole/Handlers/OnServerShutdown.php

@@ -2,11 +2,14 @@
 
 namespace Laravel\Octane\Swoole;
 
+use Laravel\Octane\Exec;
+
 class ServerProcessInspector
 {
     public function __construct(
         protected SignalDispatcher $dispatcher,
-        protected ServerStateFile $serverStateFile
+        protected ServerStateFile $serverStateFile,
+        protected Exec $exec,
     ) {
     }
 
@@ -53,7 +56,7 @@ public function stopServer(): bool
             'managerProcessId' => $managerProcessId
         ] = $this->serverStateFile->read();
 
-        exec('pgrep -P '.$managerProcessId, $workerProcessIds);
+        $workerProcessIds = $this->exec->run('pgrep -P '.$managerProcessId);
 
         foreach ([$masterProcessId, $managerProcessId, ...$workerProcessIds] as $processId) {
             $this->dispatcher->signal($processId, SIGKILL);

src/Swoole/ServerProcessInspector.php

@@ -2,6 +2,7 @@
 
 namespace Laravel\Octane\Tests;
 
+use Laravel\Octane\Exec;
 use Laravel\Octane\Swoole\ServerProcessInspector;
 use Laravel\Octane\Swoole\ServerStateFile;
 use Laravel\Octane\Swoole\SignalDispatcher;
@@ -14,7 +15,8 @@ public function test_can_determine_if_swoole_server_process_is_running_when_mana
     {
         $inspector = new ServerProcessInspector(
             $dispatcher = Mockery::mock(SignalDispatcher::class),
-            $processIdFile = new ServerStateFile(sys_get_temp_dir().'/swoole.pid')
+            $processIdFile = new ServerStateFile(sys_get_temp_dir().'/swoole.pid'),
+            Mockery::mock(Exec::class),
         );
 
         $dispatcher->shouldReceive('canCommunicateWith')->with(2)->andReturn(true);
@@ -31,7 +33,8 @@ public function test_can_determine_if_swoole_server_process_is_running_when_mana
     {
         $inspector = new ServerProcessInspector(
             $dispatcher = Mockery::mock(SignalDispatcher::class),
-            $processIdFile = new ServerStateFile(sys_get_temp_dir().'/swoole.pid')
+            $processIdFile = new ServerStateFile(sys_get_temp_dir().'/swoole.pid'),
+            Mockery::mock(Exec::class),
         );
 
         $dispatcher->shouldReceive('canCommunicateWith')->with(2)->andReturn(false);
@@ -48,7 +51,8 @@ public function test_can_determine_if_swoole_server_process_is_running_when_only
     {
         $inspector = new ServerProcessInspector(
             $dispatcher = Mockery::mock(SignalDispatcher::class),
-            $processIdFile = new ServerStateFile(sys_get_temp_dir().'/swoole.pid')
+            $processIdFile = new ServerStateFile(sys_get_temp_dir().'/swoole.pid'),
+            Mockery::mock(Exec::class),
         );
 
         $dispatcher->shouldReceive('canCommunicateWith')->with(1)->andReturn(true);
@@ -65,7 +69,8 @@ public function test_can_determine_if_swoole_server_process_is_running_when_mast
     {
         $inspector = new ServerProcessInspector(
             $dispatcher = Mockery::mock(SignalDispatcher::class),
-            $processIdFile = new ServerStateFile(sys_get_temp_dir().'/swoole.pid')
+            $processIdFile = new ServerStateFile(sys_get_temp_dir().'/swoole.pid'),
+            Mockery::mock(Exec::class),
         );
 
         $dispatcher->shouldReceive('canCommunicateWith')->with(1)->andReturn(false);
@@ -76,4 +81,27 @@ public function test_can_determine_if_swoole_server_process_is_running_when_mast
 
         $processIdFile->delete();
     }
+
+    public function test_swoole_server_process_can_be_stop()
+    {
+        $inspector = new ServerProcessInspector(
+            $dispatcher = Mockery::mock(SignalDispatcher::class),
+            $processIdFile = new ServerStateFile(sys_get_temp_dir().'/swoole.pid'),
+            $exec = Mockery::mock(Exec::class),
+        );
+
+        $processIdFile->writeProcessIds(3, 2);
+        $exec->shouldReceive('run')->once()->with('pgrep -P 2')->andReturn([4, 5]);
+
+        collect([2, 3, 4, 5])->each(
+            fn ($processId) => $dispatcher
+                ->shouldReceive('signal')
+                ->with($processId, SIGKILL)
+                ->once(),
+        );
+
+        $this->assertTrue($inspector->stopServer());
+
+        $processIdFile->delete();
+    }
 }