fixed：修复脚本执行完退出，导致协程没有执行完毕也推出了

bingcool · Aug 4, 2023 · 2284e96 · 2284e96
1 parent f6a8ab4
commit 2284e96
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 30 deletions.
diff --git a/Test/Scripts/FixedUser.php b/Test/Scripts/FixedUser.php
@@ -25,24 +25,27 @@ public function fixName()
             var_dump("name=".$name);
             var_dump('CID='.\Swoole\Coroutine::getCid());
             var_dump('Script test');
-            sleep(5);
+            sleep(2);
 
             var_dump('spl_object_id='.spl_object_id($this->db));
             $result1 = $this->db->newQuery()->table('tbl_users')->limit(1)->select()->toArray();
             //var_dump($result1);
 
             goApp(function () {
-                var_dump('CID11='.\Swoole\Coroutine::getCid());
-                var_dump('spl_object_id-11='.spl_object_id($this->db));
-                $result1 = $this->db->newQuery()->table('tbl_users')->limit(1)->order('user_id','desc')->select()->toArray();
-                //var_dump($result1);
+                try {
+                    var_dump('CID11='.\Swoole\Coroutine::getCid());
+                    var_dump('spl_object_id-11='.spl_object_id($this->db));
+                    $result1 = Application::getApp()->get('db')->newQuery()->table('tbl_users')->limit(1)->select()->toArray();
+                    var_dump($result1);
+                }catch (\Throwable $exception) {
+                    var_dump($exception->getMessage());
+                }
+
             });
 
         }catch (\Throwable $exception) {
             var_dump($exception->getMessage());
         }
-
-        //$this->exitAll();
     }
 
     public function onHandleException(\Throwable $throwable, array $context = [])

diff --git a/src/Http/config.php b/src/Http/config.php
@@ -33,15 +33,18 @@
         'max_request'            => 1000,
         'task_worker_num'        => 2,
         'task_tmpdir'            => '/dev/shm',
+        'task_enable_coroutine'  => 1,
+        'task_max_request'      => 1000,
         'daemonize'              => 0,
         'dispatch_mode'          => 3,
         'reload_async'           => true,
         'enable_coroutine'       => 1,
-        'task_enable_coroutine'  => 1,
+        'enable_preemptive_scheduler' => 1,
         // 压缩
         'http_compression'       => true,
         // $level 压缩等级，范围是 1-9，等级越高压缩后的尺寸越小，但 CPU 消耗更多。默认为 1, 最高为 9
         'http_compression_level' => 1,
+        'stats_file'            => '/tmp/' . APP_NAME . '/stats.log',
         'log_file'               => '/tmp/' . APP_NAME . '/swoole_log.txt',
         'pid_file'               => '/data/' . APP_NAME . '/log/server.pid',
     ],

diff --git a/src/Rpc/RpcHandler.php b/src/Rpc/RpcHandler.php
@@ -35,24 +35,6 @@ public function __construct(array $config = [])
         parent::__construct($config);
     }
 
-    /**
-     * init 当执行run方法时,首先会执行init->bootstrap
-     * @param mixed $payload
-     * @return void
-     */
-    public function init($payload)
-    {
-    }
-
-    /**
-     * bootstrap 当执行run方法时,首先会执行init->bootstrap
-     * @param mixed $payload
-     * @return void
-     */
-    public function bootstrap($payload)
-    {
-    }
-
     /**
      * run 完成初始化后路由匹配和创建访问实例
      * @param int $fd

diff --git a/src/Rpc/config.php b/src/Rpc/config.php
@@ -32,6 +32,8 @@
         'max_request'           => 1000,
         'task_worker_num'       => 2,
         'task_tmpdir'           => '/dev/shm',
+        'task_enable_coroutine' => 1,
+        'task_max_request'      => 1000,
         'daemonize'             => 0,
         'dispatch_mode'         => 2,
         'open_length_check'     => 1,
@@ -40,7 +42,8 @@
         'package_body_offset'   => 34,    //第几个字节开始计算长度
         'package_max_length'    => 2000000,//协议最大长度
         'enable_coroutine'      => 1,
-        'task_enable_coroutine' => 1,
+        'enable_preemptive_scheduler' => 1,
+        'stats_file'            => '/tmp/' . APP_NAME . '/stats.log',
         'log_file'              => '/tmp/' . APP_NAME . '/swoole_log.txt',
         'pid_file'              => '/data/' . APP_NAME . '/log/server.pid',
     ],

diff --git a/src/Script/MainCliScript.php b/src/Script/MainCliScript.php
@@ -52,6 +52,7 @@ public function run()
             $action = getenv('a');
             list($method, $params) = Helper::parseActionParams($this, $action, Helper::getCliParams());
             $this->{$action}(...$params);
+            $this->waitCoroutineFinish();
             $this->exitAll();
         }catch (\Throwable $throwable) {
             write($throwable->getMessage());
@@ -78,6 +79,24 @@ protected function isExecuted(): bool
         return false;
     }
 
+    /**
+     * 防止脚本创建协程时，主进程脚本直接退出了，会把协程也退出，导致协程没执行，所以需要等待一段时间，让协程执行完
+     *
+     * @param float $timeOut
+     * @return void
+     */
+    protected function waitCoroutineFinish(float $timeOut = 5.0)
+    {
+        $time = time();
+        while (true) {
+            $status = \Swoole\Coroutine::stats();
+            if ($status['coroutine_num'] == 1 || time() > ($time + $timeOut)) {
+                break;
+            }
+            \Swoole\Coroutine\System::sleep(0.5);
+        }
+    }
+
     /**
      * @return void
      */

diff --git a/src/Udp/config.php b/src/Udp/config.php
@@ -31,10 +31,13 @@
         'max_request'           => 1000,
         'task_worker_num'       => 2,
         'task_tmpdir'           => '/dev/shm',
+        'task_enable_coroutine' => 1,
+        'task_max_request'      => 1000,
         'daemonize'             => 0,
         'dispatch_mode'         => 3,
         'enable_coroutine'      => 1,
-        'task_enable_coroutine' => 1,
+        'enable_preemptive_scheduler' => 1,
+        'stats_file'            => '/tmp/' . APP_NAME . '/stats.log',
         'log_file'              => '/tmp/' . APP_NAME . '/swoole_log.txt',
         'pid_file'              => '/data/' . APP_NAME . '/log/server.pid',
     ],

diff --git a/src/Websocket/WebsocketEventServer.php b/src/Websocket/WebsocketEventServer.php
@@ -52,7 +52,6 @@ abstract public function onOpen(Server $server, Request $request);
      * @param Request $request
      * @param Response $response
      * @return void
-     * @throws \Throwable
      */
     public function onRequest(Request $request, Response $response)
     {

diff --git a/src/Websocket/config.php b/src/Websocket/config.php
@@ -33,10 +33,13 @@
         'max_request'           => 1000,
         'task_worker_num'       => 2,
         'task_tmpdir'           => '/dev/shm',
+        'task_enable_coroutine' => 1,
+        'task_max_request'      => 1000,
         'daemonize'             => 0,
         'dispatch_mode'         => 2,
         'enable_coroutine'      => 1,
-        'task_enable_coroutine' => 1,
+        'enable_preemptive_scheduler' => 1,
+        'stats_file'            => '/tmp/' . APP_NAME . '/stats.log',
         'log_file'              => '/tmp/' . APP_NAME . '/swoole_log.txt',
         'pid_file'              => '/data/' . APP_NAME . '/log/server.pid',
     ],