From b861e0b17baecb3ef9878ca9783c652fd0be40f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=91=E6=9E=97?= Date: Fri, 14 Jan 2022 14:51:35 +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 | 1 - Server.php | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Handler/OnServerWorker.php b/Handler/OnServerWorker.php index 16cad36..1d87e6b 100644 --- a/Handler/OnServerWorker.php +++ b/Handler/OnServerWorker.php @@ -46,7 +46,6 @@ 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)); - Kiri::getDi()->get(Router::class)->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 f1796ac..8733612 100644 --- a/Server.php +++ b/Server.php @@ -11,6 +11,7 @@ use Kiri\Annotation\Inject; use Kiri\Events\EventDispatch; use Kiri\Exception\ConfigException; use Kiri\Message\Handler\Abstracts\HttpService; +use Kiri\Message\Handler\Router; use Kiri\Server\Events\OnShutdown; use Psr\Container\ContainerExceptionInterface; use Kiri\Server\Events\OnServerBeforeStart; @@ -98,6 +99,8 @@ class Server extends HttpService $this->eventDispatch->dispatch(new OnServerBeforeStart()); + Kiri::getDi()->get(Router::class)->scan_build_route(); + return $this->manager->getServer()->start(); }