as2252258/kiri-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

modify

Browse Source
This commit is contained in:
as2252258@163.com
2021-07-26 01:22:57 +08:00
parent f1e2fc3b42
commit 82350f3c81
1 changed files with 361 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/ServerManager.php
+4 -10
View File
@@ -188,15 +188,14 @@ class ServerManager extends Abstracts\Server
if ($this->server) { if ($this->server) {
$context->addNewListener($config['type'], $config['host'], $config['port'], $config['mode'], $config); $context->addNewListener($config['type'], $config['host'], $config['port'], $config['mode'], $config);
} else { } else {
$config['settings'] = array_merge($configs['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');
} }
if (!isset($config['settings']['pid_file'])) { if (!isset($config['settings']['pid_file'])) {
$config['settings']['pid_file'] = storage('.pid'); $config['settings']['pid_file'] = storage('swoole.pid');
} }
$config['events'] = array_merge($configs['events'] ?? [], $config['events'] ?? []); $config['events'] = $config['events'] ?? [];
$context->createBaseServer($config['type'], $config['host'], $config['port'], $config['mode'], $config); $context->createBaseServer($config['type'], $config['host'], $config['port'], $config['mode'], $config);
} }
} }
@@ -266,12 +265,7 @@ class ServerManager extends Abstracts\Server
Constant::SERVER_TYPE_WEBSOCKET => WServer::class Constant::SERVER_TYPE_WEBSOCKET => WServer::class
}; };
$this->server = new $match($host, $port, SWOOLE_PROCESS, $mode); $this->server = new $match($host, $port, SWOOLE_PROCESS, $mode);
$this->server->set(array_merge(Config::get('server.settings', []), $settings['settings']));
$merges = array_merge(Config::get('server.settings', []), $settings['settings']);
if (!isset($merges['pid_file'])){
$merges['pid_file'] = storage('swoole.pid');
}
$this->server->set($merges);
echo sprintf("\033[36m[" . date('Y-m-d H:i:s') . "]\033[0m $type service %s::%d start.", $host, $port) . PHP_EOL; echo sprintf("\033[36m[" . date('Y-m-d H:i:s') . "]\033[0m $type service %s::%d start.", $host, $port) . PHP_EOL;