fix

workbunny · Oct 1, 2024 · a19657e · a19657e
1 parent 753b786
commit a19657e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/src/CoroutineWebServer.php b/src/CoroutineWebServer.php
@@ -117,7 +117,7 @@ public function onMessage($connection, $request, ...$params)
         $channel->push(func_get_args());
         $waitGroup = new WaitGroup();
         // 根据request consumer数量创建协程
-        $consumerCount = config('plugin.workbunny.webman-coroutine.app.consumer_count', 1);
+        $consumerCount = max(1, config('plugin.workbunny.webman-coroutine.app.consumer_count', 1));
         foreach (range(1, $consumerCount) as $ignored) {
             $waitGroup->add();
             // 请求消费协程

diff --git a/src/Handlers/SwooleHandler.php b/src/Handlers/SwooleHandler.php
@@ -92,7 +92,7 @@ public static function onMessage(CoroutineServerInterface $app, mixed $connectio
         ]);
         $waitGroup = new WaitGroup();
         // 根据request consumer数量创建协程
-        $consumerCount = config('plugin.workbunny.webman-coroutine.app.consumer_count', 1);
+        $consumerCount = max(1, config('plugin.workbunny.webman-coroutine.app.consumer_count', 1));
         foreach (range(1, $consumerCount) as $ignored) {
             // 协程监听通道，消费
             $res = Coroutine::create(function () use ($app, $connectionChannels, $waitGroup) {

diff --git a/src/Handlers/SwowHandler.php b/src/Handlers/SwowHandler.php
@@ -80,7 +80,7 @@ public static function onMessage(CoroutineServerInterface $app, mixed $connectio
         ]);
         $waitGroup = new WaitGroup();
         // 根据request consumer数量创建协程
-        $consumerCount = config('plugin.workbunny.webman-coroutine.app.consumer_count', 1);
+        $consumerCount = max(1, config('plugin.workbunny.webman-coroutine.app.consumer_count', 1));
         foreach (range(1, $consumerCount) as $ignored) {
             $waitGroup->add();
             // 请求消费协程

diff --git a/src/Utils/WaitGroup/Handlers/SwooleWaitGroup.php b/src/Utils/WaitGroup/Handlers/SwooleWaitGroup.php
@@ -23,6 +23,10 @@ public function __construct()
     /** @inheritdoc  */
     public function __destruct()
     {
+        $count = max(1, $this->count());
+        foreach (range(1, $count) as $ignored) {
+            $this->done();
+        }
         $this->_waitGroup = null;
     }
 

diff --git a/src/Utils/Worker/ServerMethods.php b/src/Utils/Worker/ServerMethods.php
@@ -204,7 +204,8 @@ protected function __runInit__serverMethods(): void
                 ]);
                 $waitGroup = new WaitGroup();
                 // 消费者消费
-                foreach (range(1, $this->getConnectionConsumerCount()) as $ignored) {
+                $count = max(1, $this->getConnectionConsumerCount());
+                foreach (range(1, $count) as $ignored) {
                     $waitGroup->add();
                     // 协程创建
                     $this->getCoroutine()->create(function () use ($channel, $waitGroup) {