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-21 15:58:33 +08:00
parent 0c20f975de
commit ee0111ad0c
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/ServerManager.php
+6 -1
View File
@@ -9,6 +9,7 @@ use Server\SInterface\CustomProcess;
use Server\SInterface\TaskExecute; use Server\SInterface\TaskExecute;
use Server\Task\ServerTask; use Server\Task\ServerTask;
use Snowflake\Abstracts\Config; use Snowflake\Abstracts\Config;
use Snowflake\Exception\ConfigException;
use Snowflake\Exception\NotFindClassException; use Snowflake\Exception\NotFindClassException;
use Snowflake\Snowflake; use Snowflake\Snowflake;
use Swoole\Http\Server as HServer; use Swoole\Http\Server as HServer;
@@ -251,6 +252,7 @@ class ServerManager extends Abstracts\Server
* @param array $settings * @param array $settings
* @throws NotFindClassException * @throws NotFindClassException
* @throws ReflectionException * @throws ReflectionException
* @throws ConfigException
*/ */
private function createBaseServer(string $type, string $host, int $port, int $mode, array $settings = []) private function createBaseServer(string $type, string $host, int $port, int $mode, array $settings = [])
{ {
@@ -261,7 +263,10 @@ 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($settings['settings']); $this->server->set(array_merge(
Config::get('server.setting', []),
$settings['settings']
));
$this->addDefaultListener($type, $settings); $this->addDefaultListener($type, $settings);
} }