From 5e8d9ceae7e03b062d90a2c3f02565452f90eaf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=91=E6=9E=97?= Date: Mon, 20 Jun 2022 17:43:00 +0800 Subject: [PATCH] modify plugin name --- Abstracts/CoroutineServer.php | 12 +++++++----- Abstracts/ProcessManager.php | 8 +++++--- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Abstracts/CoroutineServer.php b/Abstracts/CoroutineServer.php index fbc61f9..3f0d8ad 100644 --- a/Abstracts/CoroutineServer.php +++ b/Abstracts/CoroutineServer.php @@ -77,10 +77,10 @@ class CoroutineServer implements ServerInterface public function initCoreServers(array $service, int $daemon = 0): void { // TODO: Implement initCoreServers() method. - $service = $this->genConfigService($service); - foreach ($service as $value) { - $this->addListener($value); - } + $this->servers = $this->genConfigService($service); +// foreach ($service as $value) { +// $this->addListener($value); +// } } @@ -175,7 +175,9 @@ class CoroutineServer implements ServerInterface foreach ($this->servers as $server) { Coroutine::create(function () use ($server) { - $this->runServer($server); + $this->addListener($server); + + $this->runServer($this->servers[$server->name]); }); } }); diff --git a/Abstracts/ProcessManager.php b/Abstracts/ProcessManager.php index d56bf9f..efa3f1d 100644 --- a/Abstracts/ProcessManager.php +++ b/Abstracts/ProcessManager.php @@ -12,6 +12,7 @@ use Kiri\Server\Broadcast\Message; use Kiri\Server\Contract\OnProcessInterface; use Kiri\Server\Events\OnProcessStart; use Psr\Log\LoggerInterface; +use Swoole\Coroutine; use Swoole\Process; use Kiri\Server\Events\OnProcessStop; use Kiri\Di\ContainerInterface; @@ -150,16 +151,17 @@ class ProcessManager */ protected function poolManager(array $processes): void { - $manager = new Process\Manager(); + foreach ($processes as $process) { /** @var BaseProcess $customProcess */ [$customProcess, $sProcess] = $this->add($process); $this->_process[$customProcess->getName()] = $customProcess; - $manager->add($sProcess, $customProcess->isEnableCoroutine()); + Coroutine::create(function () use ($customProcess) { + $customProcess->onSigterm()->process(null); + }); } - $manager->start(); }