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
2020-09-01 15:29:01 +08:00
parent 41cb49d7e3
commit 3a12ad4db2
4 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
http-server/Events/Http.php
+1 -2
View File
@@ -37,8 +37,8 @@ class Http extends Server
*/ */
public function __construct($application, $host, $port = null, $mode = null, $sock_type = null) public function __construct($application, $host, $port = null, $mode = null, $sock_type = null)
{ {
parent::__construct($host, $port, $mode, $sock_type);
$this->application = $application; $this->application = $application;
parent::__construct($host, $port, $mode, $sock_type);
} }
@@ -55,7 +55,6 @@ class Http extends Server
public function set(array $settings, $pool = null, $events = [], $config = []) public function set(array $settings, $pool = null, $events = [], $config = [])
{ {
parent::set($settings); parent::set($settings);
Snowflake::get()->set(Pool::class, $pool);
ServerManager::set($this, $settings, $this->application, $events, $config); ServerManager::set($this, $settings, $this->application, $events, $config);
} }
http-server/Events/Service.php
+1 -2
View File
@@ -45,8 +45,8 @@ abstract class Service extends Server
*/ */
public function __construct($application, $host, $port = null, $mode = null, $sock_type = null) public function __construct($application, $host, $port = null, $mode = null, $sock_type = null)
{ {
parent::__construct($host, $port, $mode, $sock_type);
$this->application = $application; $this->application = $application;
parent::__construct($host, $port, $mode, $sock_type);
} }
@@ -63,7 +63,6 @@ abstract class Service extends Server
public function set(array $settings, $pool = null, $events = [], $config = []) public function set(array $settings, $pool = null, $events = [], $config = [])
{ {
parent::set($settings); parent::set($settings);
Snowflake::get()->set(Pool::class, $pool);
ServerManager::set($this, $settings, $this->application, $events, $config); ServerManager::set($this, $settings, $this->application, $events, $config);
} }
http-server/Events/WebSocket.php
+1 -2
View File
@@ -48,8 +48,8 @@ class WebSocket extends Server
*/ */
public function __construct($application, $host, $port = null, $mode = null, $sock_type = null) public function __construct($application, $host, $port = null, $mode = null, $sock_type = null)
{ {
parent::__construct($host, $port, $mode, $sock_type);
$this->application = $application; $this->application = $application;
parent::__construct($host, $port, $mode, $sock_type);
} }
@@ -69,7 +69,6 @@ class WebSocket extends Server
$application = Snowflake::get(); $application = Snowflake::get();
$application->set(WebSocket::class, $this); $application->set(WebSocket::class, $this);
$application->set(Pool::class, $pool);
ServerManager::set($this, $settings, $application, $events, $config); ServerManager::set($this, $settings, $application, $events, $config);
} }
http-server/ServerManager.php
+1 -1
View File
@@ -23,6 +23,7 @@ class ServerManager
{ {
try { try {
$application = Snowflake::get(); $application = Snowflake::get();
$application->set(Pool::class, $pool);
if (is_string($process) && class_exists($process)) { if (is_string($process) && class_exists($process)) {
return static::createProcess($process, $application, $pool, $workerId); return static::createProcess($process, $application, $pool, $workerId);
} }
@@ -69,7 +70,6 @@ class ServerManager
*/ */
protected static function createProcess($process, $application, $pool, $workerId) protected static function createProcess($process, $application, $pool, $workerId)
{ {
$application->set(Pool::class, $pool);
$process = new $process($application); $process = new $process($application);
$application->debug(sprintf('Worker #%d is running.', $workerId)); $application->debug(sprintf('Worker #%d is running.', $workerId));
return $process->start(); return $process->start();