From 0f63888022138a7a114ea2d234466fc15d21e78a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mr=C2=B7x?= Date: Wed, 2 Sep 2020 18:36:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- http-server/Events/OnTask.php | 10 +++++++--- http-server/Service/Abstracts/Server.php | 7 +------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/http-server/Events/OnTask.php b/http-server/Events/OnTask.php index 8a8fb10f..4d7062dc 100644 --- a/http-server/Events/OnTask.php +++ b/http-server/Events/OnTask.php @@ -12,6 +12,10 @@ use Swoole\Server; use Swoole\Timer; use Exception; +/** + * Class OnTask + * @package HttpServer\Events + */ class OnTask extends Callback { @@ -21,10 +25,10 @@ class OnTask extends Callback public function onHandler() { $parameter = func_get_args(); - if (count($parameter) < 4) { - $this->onContinueTask(...func_get_args()); + if (func_num_args() < 4) { + $this->onContinueTask(...$parameter); } else { - $this->onTask(...func_get_args()); + $this->onTask(...$parameter); } } diff --git a/http-server/Service/Abstracts/Server.php b/http-server/Service/Abstracts/Server.php index 650bf16e..c8192ede 100644 --- a/http-server/Service/Abstracts/Server.php +++ b/http-server/Service/Abstracts/Server.php @@ -71,12 +71,7 @@ trait Server $settings = $this->setting; if (($taskNumber = $settings['task_worker_num'] ?? 0) > 0) { $this->on('finish', $this->createHandler('finish')); - $callback = $this->createHandler('task'); - if ($settings['task_enable_coroutine'] ?? false) { - $this->on('task', [$callback, 'onContinueTask']); - } else { - $this->on('task', [$callback, 'onTask']); - } + $this->on('task', $this->createHandler('task')); } }