From b6c4693ef66713b9f4c0c52dceadfb1d64cf0d34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=91=E6=9E=97?= <as2252258@163.com>
Date: Thu, 13 Jan 2022 18:36:25 +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
---
 Server.php        | 3 +++
 ServerManager.php | 5 -----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Server.php b/Server.php
index 70fd8f3..5608bd5 100644
--- a/Server.php
+++ b/Server.php
@@ -12,6 +12,7 @@ use Kiri\Exception\ConfigException;
 use Kiri\Message\Handler\Abstracts\HttpService;
 use Kiri\Server\Events\OnShutdown;
 use Psr\Container\ContainerExceptionInterface;
+use Kiri\Server\Events\OnServerBeforeStart;
 use Psr\Container\NotFoundExceptionInterface;
 use Swoole\Coroutine;
 
@@ -94,6 +95,8 @@ class Server extends HttpService
 
 		$this->container->get(ProcessManager::class)->batch($processes);
 
+		$this->eventDispatch->dispatch(new OnServerBeforeStart());
+
 		return $this->manager->getServer()->start();
 	}
 
diff --git a/ServerManager.php b/ServerManager.php
index df8d968..d3a572c 100644
--- a/ServerManager.php
+++ b/ServerManager.php
@@ -7,7 +7,6 @@ use Kiri\Abstracts\Component;
 use Kiri\Abstracts\Config;
 use Kiri\Annotation\Inject;
 use Kiri\Error\Logger;
-use Kiri\Events\EventDispatch;
 use Kiri\Exception\ConfigException;
 use Kiri\Server\Contract\OnCloseInterface;
 use Kiri\Server\Contract\OnConnectInterface;
@@ -16,7 +15,6 @@ use Kiri\Server\Contract\OnHandshakeInterface;
 use Kiri\Server\Contract\OnMessageInterface;
 use Kiri\Server\Contract\OnPacketInterface;
 use Kiri\Server\Contract\OnReceiveInterface;
-use Kiri\Server\Events\OnServerBeforeStart;
 use Kiri\Server\Handler\OnPipeMessage;
 use Kiri\Server\Handler\OnServer;
 use Kiri\Server\Handler\OnServerManager;
@@ -25,7 +23,6 @@ use Kiri\Server\Handler\OnServerWorker;
 use Kiri\Server\Tasker\OnServerTask;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
-use ReflectionException;
 use Swoole\Http\Server as HServer;
 use Swoole\Process;
 use Swoole\Server;
@@ -95,11 +92,9 @@ class ServerManager extends Component
 
 	/**
 	 * @return Server|WServer|HServer|null
-	 * @throws ReflectionException
 	 */
 	public function getServer(): Server|WServer|HServer|null
 	{
-		di(EventDispatch::class)->dispatch(new OnServerBeforeStart());
 		return $this->server;
 	}