From 1419e96c890f1efffba480e843e22ed991cafb08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=91=E6=9E=97?= Date: Mon, 17 Jan 2022 19:04:26 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E6=94=B9=E5=90=8D"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit fdf58326 --- ProcessManager.php | 10 ++++++++-- ServerManager.php | 12 ------------ 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/ProcessManager.php b/ProcessManager.php index a860f36..a0264ff 100644 --- a/ProcessManager.php +++ b/ProcessManager.php @@ -42,8 +42,14 @@ class ProcessManager $system = sprintf('[%s].process', Config::get('id', 'system-service')); $this->logger->debug($system . ' ' . $customProcess->getName() . ' start.'); - - $server->addProcess($process = $this->parse($customProcess, $system)); + $process = $this->parse($customProcess, $system); + if (Context::inCoroutine()) { + Coroutine::create(function () use ($process) { + $process->start(); + }); + } else { + $server->addProcess($process = $this->parse($customProcess, $system)); + } $this->_process[$customProcess->getName()] = $process; } diff --git a/ServerManager.php b/ServerManager.php index 9a4c354..e6c6388 100644 --- a/ServerManager.php +++ b/ServerManager.php @@ -61,9 +61,6 @@ class ServerManager extends Component private Server|null $server = null; - protected array $initProcesses = []; - - const DEFAULT_EVENT = [ Constant::WORKER_START => [OnServerWorker::class, 'onWorkerStart'], Constant::WORKER_EXIT => [OnServerWorker::class, 'onWorkerExit'], @@ -160,15 +157,6 @@ class ServerManager extends Component } - /** - * @return array - */ - public function getProcesses(): array - { - return $this->initProcesses; - } - - /** * @return array */