修复部分服务器事件监听问题

imiphp · Jul 30, 2018 · 188fdea · 188fdea
1 parent c9c3367
commit 188fdea
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 12 deletions.
diff --git a/src/Server/Base.php b/src/Server/Base.php
@@ -81,7 +81,7 @@ public function __construct($name, $config, $isSubServer = false)
 		}
 		if(!empty($config['configs']))
 		{
-			$this->swooleServer->set($config['configs']);
+			($this->swoolePort ?? $this->swooleServer)->set($config['configs']);
 		}
 		$this->bindEvents();
 	}

diff --git a/src/Server/Http/Server.php b/src/Server/Http/Server.php
@@ -57,7 +57,9 @@ protected function getServerInitConfig()
 	 */
 	protected function __bindEvents()
 	{
-		$this->swooleServer->on('request', function(\swoole_http_request $swooleRequest, \swoole_http_response $swooleResponse){
+		$server = $this->swoolePort ?? $this->swooleServer;
+
+		$server->on('request', function(\swoole_http_request $swooleRequest, \swoole_http_response $swooleResponse){
 			$request = new Request($this, $swooleRequest);
 			$response = new Response($this, $swooleResponse);
 			$this->trigger('request', [
@@ -66,7 +68,7 @@ protected function __bindEvents()
 			], $this, RequestEventParam::class);
 		});
 
-		$this->swooleServer->on('close', function(\swoole_http_server $server, $fd, $reactorID){
+		$server->on('close', function(\swoole_http_server $server, $fd, $reactorID){
 			$this->trigger('close', [
 				'server'	=>	$this,
 				'fd'		=>	$fd,

diff --git a/src/Server/TcpServer/Server.php b/src/Server/TcpServer/Server.php
@@ -69,15 +69,17 @@ protected function getServerInitConfig()
 	 */
 	protected function __bindEvents()
 	{
-		$this->swooleServer->on('connect', function(\swoole_server $server, $fd, $reactorID){
+		$server = $this->swoolePort ?? $this->swooleServer;
+
+		$server->on('connect', function(\swoole_server $server, $fd, $reactorID){
 			$this->trigger('connect', [
 				'server'	=>	$this,
 				'fd'		=>	$fd,
 				'reactorID'	=>	$reactorID,
 			], $this, ConnectEventParam::class);
 		});
 
-		$this->swooleServer->on('receive', function(\swoole_server $server, $fd, $reactorID, $data){
+		$server->on('receive', function(\swoole_server $server, $fd, $reactorID, $data){
 			$this->trigger('receive', [
 				'server'	=>	$this,
 				'fd'		=>	$fd,
@@ -86,22 +88,22 @@ protected function __bindEvents()
 			], $this, ReceiveEventParam::class);
 		});
 
-		$this->swooleServer->on('close', function(\swoole_server $server, $fd, $reactorID){
+		$server->on('close', function(\swoole_server $server, $fd, $reactorID){
 			$this->trigger('close', [
 				'server'	=>	$this,
 				'fd'		=>	$fd,
 				'reactorID'	=>	$reactorID,
 			], $this, CloseEventParam::class);
 		});
 
-		$this->swooleServer->on('BufferFull', function(\swoole_server $server, $fd){
+		$server->on('BufferFull', function(\swoole_server $server, $fd){
 			$this->trigger('bufferFull', [
 				'server'	=>	$this,
 				'fd'		=>	$fd,
 			], $this, BufferEventParam::class);
 		});
 
-		$this->swooleServer->on('BufferEmpty', function(\swoole_server $server, $fd){
+		$server->on('BufferEmpty', function(\swoole_server $server, $fd){
 			$this->trigger('bufferEmpty', [
 				'server'	=>	$this,
 				'fd'		=>	$fd,

diff --git a/src/Server/UdpServer/Server.php b/src/Server/UdpServer/Server.php
@@ -66,7 +66,9 @@ protected function getServerInitConfig()
 	 */
 	protected function __bindEvents()
 	{
-		$this->swooleServer->on('packet', function(\swoole_server $server, $data, $clientInfo){
+		$server = $this->swoolePort ?? $this->swooleServer;
+
+		$server->on('packet', function(\swoole_server $server, $data, $clientInfo){
 			$this->trigger('packet', [
 				'server'	=>	$this,
 				'data'		=>	$data,

diff --git a/src/Server/WebSocket/Server.php b/src/Server/WebSocket/Server.php
@@ -70,7 +70,9 @@ protected function getServerInitConfig()
 	 */
 	protected function __bindEvents()
 	{
-		$this->swooleServer->on('handShake', function(\swoole_http_request $swooleRequest, \swoole_http_response $swooleResponse){
+		$server = $this->swoolePort ?? $this->swooleServer;
+
+		$server->on('handShake', function(\swoole_http_request $swooleRequest, \swoole_http_response $swooleResponse){
 			$request = new Request($this, $swooleRequest);
 			$response = new Response($this, $swooleResponse);
 			$this->trigger('handShake', [
@@ -79,14 +81,14 @@ protected function __bindEvents()
 			], $this, HandShakeEventParam::class);
 		});
 
-		$this->swooleServer->on('message', function (\swoole_websocket_server $server, \swoole_websocket_frame $frame) {
+		$server->on('message', function (\swoole_websocket_server $server, \swoole_websocket_frame $frame) {
 			$this->trigger('message', [
 				'server'	=>	$this,
 				'frame'		=>	$frame,
 			], $this, MessageEventParam::class);
 		});
 
-		$this->swooleServer->on('close', function(\swoole_http_server $server, $fd, $reactorID){
+		$server->on('close', function(\swoole_http_server $server, $fd, $reactorID){
 			$this->trigger('close', [
 				'server'	=>	$this,
 				'fd'		=>	$fd,