From 9fe40ff78a5b3012f06429cd3f515b134bc219aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=91=E6=9E=97?= Date: Fri, 14 Jan 2022 15:20:57 +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 --- Handler/OnServerWorker.php | 13 +++++++++++++ Server.php | 2 -- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Handler/OnServerWorker.php b/Handler/OnServerWorker.php index 1d87e6b..d6ac2fb 100644 --- a/Handler/OnServerWorker.php +++ b/Handler/OnServerWorker.php @@ -35,6 +35,18 @@ class OnServerWorker extends \Kiri\Server\Abstracts\Server public EventDispatch $eventDispatch; + public Router $collector; + + + /** + * @return void + */ + public function init() + { + $this->collector = Kiri::getDi()->get(Router::class); + } + + /** * @param Server $server * @param int $workerId @@ -46,6 +58,7 @@ class OnServerWorker extends \Kiri\Server\Abstracts\Server set_env('environmental_workerId', $workerId); if ($workerId < $server->setting['worker_num']) { $this->setProcessName(sprintf('Worker[%d].%d', $server->worker_pid, $workerId)); + $this->collector->scan_build_route(); $this->eventDispatch->dispatch(new OnWorkerStart($server, $workerId)); set_env('environmental', Kiri::WORKER); } else { diff --git a/Server.php b/Server.php index 8733612..f2e3de0 100644 --- a/Server.php +++ b/Server.php @@ -99,8 +99,6 @@ class Server extends HttpService $this->eventDispatch->dispatch(new OnServerBeforeStart()); - Kiri::getDi()->get(Router::class)->scan_build_route(); - return $this->manager->getServer()->start(); }