From c011c39bbc3fa7aa92084ee8fa7d7e1cf329a1e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mr=C2=B7x?= <as2252258@163.com>
Date: Wed, 4 Aug 2021 16:54:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Server/ServerManager.php | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/Server/ServerManager.php b/Server/ServerManager.php
index 4e481ec7..33c060b3 100644
--- a/Server/ServerManager.php
+++ b/Server/ServerManager.php
@@ -95,16 +95,11 @@ class ServerManager extends Abstracts\Server
 	 */
 	public function initBaseServer($configs): void
 	{
-		try {
-			$context = ServerManager::getContext();
-			foreach ($this->sortService($configs['ports']) as $config) {
-				$this->startListenerHandler($context, $config);
-			}
-			$this->bindCallback($this->server, $this->getSystemEvents($configs));
-		}catch (\Throwable $throwable){
-			var_dump($throwable);
-			exit();
+		$context = ServerManager::getContext();
+		foreach ($this->sortService($configs['ports']) as $config) {
+			$this->startListenerHandler($context, $config);
 		}
+		$this->bindCallback($this->server, $this->getSystemEvents($configs));
 	}
 
 
@@ -173,7 +168,6 @@ class ServerManager extends Abstracts\Server
 				$array[] = $port;
 			}
 		}
-		var_dump($array);
 		return $array;
 	}
 
@@ -210,9 +204,7 @@ class ServerManager extends Abstracts\Server
 	 */
 	private function startListenerHandler(ServerManager $context, array $config)
 	{
-		if ($this->server) {
-			$context->addListener($config['type'], $config['host'], $config['port'], $config['mode'], $config);
-		} else {
+		if (!$this->server) {
 			$config['settings'] = $config['settings'] ?? [];
 			if (!isset($config['settings']['log_file'])) {
 				$config['settings']['log_file'] = storage('system.log');
@@ -221,8 +213,8 @@ class ServerManager extends Abstracts\Server
 				$config['settings']['pid_file'] = storage('swoole.pid');
 			}
 			$config['events'] = $config['events'] ?? [];
-			$context->addListener($config['type'], $config['host'], $config['port'], $config['mode'], $config);
 		}
+		$context->addListener($config['type'], $config['host'], $config['port'], $config['mode'], $config);
 	}