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

改名

Browse Source
This commit is contained in:
Mr·x
2021-07-20 11:41:00 +08:00
parent 1897254498
commit 939ceba776
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/ServerManager.php
+7 -2
View File
@@ -55,7 +55,6 @@ class ServerManager extends Abstracts\Server
*/ */
public function getServer(): Server|WServer|HServer|null public function getServer(): Server|WServer|HServer|null
{ {
var_dump($this->server);
return $this->server; return $this->server;
} }
@@ -172,6 +171,7 @@ class ServerManager extends Abstracts\Server
* @param array $config * @param array $config
* @throws NotFindClassException * @throws NotFindClassException
* @throws ReflectionException * @throws ReflectionException
* @throws \Exception
*/ */
private function startListenerHandler(ServerManager $context, array $config) private function startListenerHandler(ServerManager $context, array $config)
{ {
@@ -180,8 +180,13 @@ class ServerManager extends Abstracts\Server
} else { } else {
$config['settings'] = array_merge($configs['settings'] ?? [], $config['settings'] ?? []); $config['settings'] = array_merge($configs['settings'] ?? [], $config['settings'] ?? []);
if (!isset($config['settings']['log_file'])) {
$config['settings']['log_file'] = storage('system.log');
}
if (!isset($config['settings']['pid_file'])) {
$config['settings']['pid_file'] = storage('.pid');
}
$config['events'] = array_merge($configs['events'] ?? [], $config['events'] ?? []); $config['events'] = array_merge($configs['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);
} }
} }