diff --git a/http-server/Events/Http.php b/http-server/Events/Http.php index 1532ec5f..e40d6620 100644 --- a/http-server/Events/Http.php +++ b/http-server/Events/Http.php @@ -37,8 +37,8 @@ class Http extends Server */ public function __construct($application, $host, $port = null, $mode = null, $sock_type = null) { - parent::__construct($host, $port, $mode, $sock_type); $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 = []) { parent::set($settings); - Snowflake::get()->set(Pool::class, $pool); ServerManager::set($this, $settings, $this->application, $events, $config); } diff --git a/http-server/Events/Service.php b/http-server/Events/Service.php index dc1847b0..644a5448 100644 --- a/http-server/Events/Service.php +++ b/http-server/Events/Service.php @@ -45,8 +45,8 @@ abstract class Service extends Server */ public function __construct($application, $host, $port = null, $mode = null, $sock_type = null) { - parent::__construct($host, $port, $mode, $sock_type); $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 = []) { parent::set($settings); - Snowflake::get()->set(Pool::class, $pool); ServerManager::set($this, $settings, $this->application, $events, $config); } diff --git a/http-server/Events/WebSocket.php b/http-server/Events/WebSocket.php index 22376464..e899844a 100644 --- a/http-server/Events/WebSocket.php +++ b/http-server/Events/WebSocket.php @@ -48,8 +48,8 @@ class WebSocket extends Server */ public function __construct($application, $host, $port = null, $mode = null, $sock_type = null) { - parent::__construct($host, $port, $mode, $sock_type); $this->application = $application; + parent::__construct($host, $port, $mode, $sock_type); } @@ -69,7 +69,6 @@ class WebSocket extends Server $application = Snowflake::get(); $application->set(WebSocket::class, $this); - $application->set(Pool::class, $pool); ServerManager::set($this, $settings, $application, $events, $config); } diff --git a/http-server/ServerManager.php b/http-server/ServerManager.php index e3b65c3d..c3bc5193 100644 --- a/http-server/ServerManager.php +++ b/http-server/ServerManager.php @@ -23,6 +23,7 @@ class ServerManager { try { $application = Snowflake::get(); + $application->set(Pool::class, $pool); if (is_string($process) && class_exists($process)) { return static::createProcess($process, $application, $pool, $workerId); } @@ -69,7 +70,6 @@ class ServerManager */ protected static function createProcess($process, $application, $pool, $workerId) { - $application->set(Pool::class, $pool); $process = new $process($application); $application->debug(sprintf('Worker #%d is running.', $workerId)); return $process->start();