From 2f5b55ea1f445323f4e4c9cafb72a86313199dd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=91=E6=9E=97?= Date: Fri, 17 Jun 2022 12:33:14 +0800 Subject: [PATCH] modify plugin name --- Abstracts/ProcessManager.php | 9 +++++---- Server.php | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Abstracts/ProcessManager.php b/Abstracts/ProcessManager.php index 7341eb6..d56bf9f 100644 --- a/Abstracts/ProcessManager.php +++ b/Abstracts/ProcessManager.php @@ -118,15 +118,16 @@ class ProcessManager /** - * @param array $processes + * @param array|null $processes * @param \Swoole\Server|null $server * @return void * @throws ConfigException */ - public function batch(array $processes, ?\Swoole\Server $server = null): void + public function batch(?array $processes, ?\Swoole\Server $server = null): void { - $processes = array_merge($processes, Config::get('processes', [])); - + if (empty($processes)) { + return; + } if (Context::inCoroutine()) { $this->poolManager($processes); return; diff --git a/Server.php b/Server.php index 78f0ae7..bd99b7d 100644 --- a/Server.php +++ b/Server.php @@ -130,6 +130,7 @@ class Server extends HttpService $this->onHotReload(); $this->processManager->batch($this->process, $this->manager->getServer()); + $this->processManager->batch(Config::get('processes', []), $this->manager->getServer()); $this->dispatch->dispatch(new OnServerBeforeStart()); $this->manager->start(); }