修复执行php bin/swoft stop命令时master进程异常未退出的问题，以及停止失败后，pid文件被删除的问题 (#134)

* 修复执行php bin/swoft stop命令时master进程异常未退出的问题；修复执行php bin/swoft stop失败，但pid文件仍被删除的问题。 * Update AbstractServer.php
swoft-cloud · Jul 20, 2018 · 3abb03d · 3abb03d
1 parent 15c89b4
commit 3abb03d
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 16 deletions.
diff --git a/src/framework/src/Bootstrap/Server/AbstractServer.php b/src/framework/src/Bootstrap/Server/AbstractServer.php
@@ -127,25 +127,25 @@ public function reload($onlyTask = false)
      */
     public function stop(): bool
     {
+        //获取master进程ID
+        $masterPid = $this->serverSetting['masterPid'];
+        //使用swoole_process::kill代替posix_kill
+        $result = \swoole_process::kill($masterPid);
         $timeout = 60;
         $startTime = time();
-        $this->serverSetting['masterPid'] && posix_kill($this->serverSetting['masterPid'], SIGTERM);
-
-        $result = true;
-        while (1) {
-            $masterIslive = $this->serverSetting['masterPid'] && posix_kill($this->serverSetting['masterPid'], SIGTERM);
-            if ($masterIslive) {
-                if (time() - $startTime >= $timeout) {
-                    $result = false;
-                    break;
+        while (true) {
+            //检测进程是否退出
+            if(!\swoole_process::kill($masterPid, 0)) {
+                //判断是否超时
+                if(time() - $startTime >= $timeout) {
+                    return false;
                 }
                 usleep(10000);
                 continue;
             }
-
-            break;
+            
+            return true;
         }
-        return $result;
     }
 
     /**
@@ -159,7 +159,7 @@ public function isRunning(): bool
         $pFile = $this->serverSetting['pfile'];
 
         // Is pid file exist ?
-        if (file_exists($pFile)) {
+        if (\file_exists($pFile)) {
             // Get pid file content and parse the content
             $pidFile = file_get_contents($pFile);
             $pids = explode(',', $pidFile);

diff --git a/src/http-server/src/Command/ServerCommand.php b/src/http-server/src/Command/ServerCommand.php
@@ -122,7 +122,6 @@ public function stop()
         $serverStatus = $httpServer->getServerSetting();
         $pidFile = $serverStatus['pfile'];
 
-        @unlink($pidFile);
         \output()->writeln(sprintf('<info>Swoft %s is stopping ...</info>', input()->getScript()));
 
         $result = $httpServer->stop();
@@ -131,6 +130,8 @@ public function stop()
         if (!$result) {
             \output()->writeln(sprintf('<error>Swoft %s stop fail</error>', input()->getScript()), true, true);
         }
+        //删除pid文件
+        @unlink($pidFile);
 
         output()->writeln(sprintf('<success>Swoft %s stop success!</success>', input()->getScript()));
     }

diff --git a/src/rpc-server/src/Command/RpcCommand.php b/src/rpc-server/src/Command/RpcCommand.php
@@ -101,7 +101,6 @@ public function stop()
         $serverStatus = $rpcServer->getServerSetting();
         $pidFile = $serverStatus['pfile'];
 
-        @unlink($pidFile);
         \output()->writeln(sprintf('<info>Swoft %s is stopping ...</info>', input()->getFullScript()));
 
         $result = $rpcServer->stop();
@@ -110,6 +109,8 @@ public function stop()
         if (! $result) {
             \output()->writeln(sprintf('<error>Swoft %s stop fail</error>', input()->getFullScript()));
         }
+        //删除pid文件
+        @unlink($pidFile);
 
         \output()->writeln(sprintf('<success>Swoft %s stop success</success>', input()->getFullScript()));
     }

diff --git a/src/websocket-server/src/Command/WsCommand.php b/src/websocket-server/src/Command/WsCommand.php
@@ -120,7 +120,6 @@ public function stop()
         $serverOpts = $server->getServerSetting();
         $pidFile = $serverOpts['pfile'];
 
-        @unlink($pidFile);
         \output()->writeln(sprintf('<info>Swoft %s is stopping ...</info>', input()->getScript()));
 
         $result = $server->stop();
@@ -129,6 +128,8 @@ public function stop()
         if (!$result) {
             \output()->writeln(sprintf('<error>Swoft %s stop fail</error>', input()->getScript()), true, true);
         }
+        //删除pid文件
+        @unlink($pidFile);
 
         \output()->writeln(sprintf('<success>Swoft %s stop success!</success>', input()->getScript()));
     }