This commit is contained in:
2021-08-04 16:54:37 +08:00
parent 1a5759448e
commit c011c39bbc
+2 -10
View File
@@ -95,16 +95,11 @@ class ServerManager extends Abstracts\Server
*/ */
public function initBaseServer($configs): void public function initBaseServer($configs): void
{ {
try {
$context = ServerManager::getContext(); $context = ServerManager::getContext();
foreach ($this->sortService($configs['ports']) as $config) { foreach ($this->sortService($configs['ports']) as $config) {
$this->startListenerHandler($context, $config); $this->startListenerHandler($context, $config);
} }
$this->bindCallback($this->server, $this->getSystemEvents($configs)); $this->bindCallback($this->server, $this->getSystemEvents($configs));
}catch (\Throwable $throwable){
var_dump($throwable);
exit();
}
} }
@@ -173,7 +168,6 @@ class ServerManager extends Abstracts\Server
$array[] = $port; $array[] = $port;
} }
} }
var_dump($array);
return $array; return $array;
} }
@@ -210,9 +204,7 @@ class ServerManager extends Abstracts\Server
*/ */
private function startListenerHandler(ServerManager $context, array $config) private function startListenerHandler(ServerManager $context, array $config)
{ {
if ($this->server) { if (!$this->server) {
$context->addListener($config['type'], $config['host'], $config['port'], $config['mode'], $config);
} else {
$config['settings'] = $config['settings'] ?? []; $config['settings'] = $config['settings'] ?? [];
if (!isset($config['settings']['log_file'])) { if (!isset($config['settings']['log_file'])) {
$config['settings']['log_file'] = storage('system.log'); $config['settings']['log_file'] = storage('system.log');
@@ -221,8 +213,8 @@ class ServerManager extends Abstracts\Server
$config['settings']['pid_file'] = storage('swoole.pid'); $config['settings']['pid_file'] = storage('swoole.pid');
} }
$config['events'] = $config['events'] ?? []; $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);
} }