From 8cd9979e2be17e6043959f7206bf254071397b72 Mon Sep 17 00:00:00 2001
From: kercylan98 <kercylan@gmail.com>
Date: Thu, 31 Aug 2023 13:32:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20server=20=E4=B8=AD?=
 =?UTF-8?q?=20HTTP=20=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E6=97=B6=E4=BC=9A=E5=BC=95=E5=8F=91=E7=A9=BA=E6=8C=87=E9=92=88?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/message.go | 18 ------------------
 server/server.go  |  2 +-
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/server/message.go b/server/message.go
index 57d5eac..4b32257 100644
--- a/server/message.go
+++ b/server/message.go
@@ -106,9 +106,6 @@ func (slf MessageType) String() string {
 
 // PushPacketMessage 向特定服务器中推送 MessageTypePacket 消息
 func PushPacketMessage(srv *Server, conn *Conn, wst int, packet []byte, mark ...any) {
-	if srv.messagePool == nil {
-		return
-	}
 	msg := srv.messagePool.Get()
 	msg.t = MessageTypePacket
 	msg.attrs = append([]any{&Conn{ctx: context.WithValue(conn.ctx, contextKeyWST, wst), connection: conn.connection}, packet}, mark...)
@@ -117,9 +114,6 @@ func PushPacketMessage(srv *Server, conn *Conn, wst int, packet []byte, mark ...
 
 // PushErrorMessage 向特定服务器中推送 MessageTypeError 消息
 func PushErrorMessage(srv *Server, err error, action MessageErrorAction, mark ...any) {
-	if srv.messagePool == nil {
-		return
-	}
 	msg := srv.messagePool.Get()
 	msg.t = MessageTypeError
 	msg.attrs = append([]any{err, action}, mark...)
@@ -128,9 +122,6 @@ func PushErrorMessage(srv *Server, err error, action MessageErrorAction, mark ..
 
 // PushCrossMessage 向特定服务器中推送 MessageTypeCross 消息
 func PushCrossMessage(srv *Server, crossName string, serverId int64, packet []byte, mark ...any) {
-	if srv.messagePool == nil {
-		return
-	}
 	if serverId == srv.id {
 		msg := srv.messagePool.Get()
 		msg.t = MessageTypeCross
@@ -150,9 +141,6 @@ func PushCrossMessage(srv *Server, crossName string, serverId int64, packet []by
 
 // PushTickerMessage 向特定服务器中推送 MessageTypeTicker 消息
 func PushTickerMessage(srv *Server, caller func(), mark ...any) {
-	if srv.messagePool == nil {
-		return
-	}
 	msg := srv.messagePool.Get()
 	msg.t = MessageTypeTicker
 	msg.attrs = append([]any{caller}, mark...)
@@ -166,9 +154,6 @@ func PushTickerMessage(srv *Server, caller func(), mark ...any) {
 //
 // 在通过 WithShunt 使用分流服务器时，异步消息不会转换到分流通道中进行处理。依旧需要注意上方第三条
 func PushAsyncMessage(srv *Server, caller func() error, callback func(err error), mark ...any) {
-	if srv.messagePool == nil {
-		return
-	}
 	msg := srv.messagePool.Get()
 	msg.t = MessageTypeAsync
 	msg.attrs = append([]any{caller, callback}, mark...)
@@ -177,9 +162,6 @@ func PushAsyncMessage(srv *Server, caller func() error, callback func(err error)
 
 // PushSystemMessage 向特定服务器中推送 MessageTypeSystem 消息
 func PushSystemMessage(srv *Server, handle func(), mark ...any) {
-	if srv.messagePool == nil {
-		return
-	}
 	msg := srv.messagePool.Get()
 	msg.t = MessageTypeSystem
 	msg.attrs = append([]any{handle}, mark...)
diff --git a/server/server.go b/server/server.go
index 44e936e..e0072ff 100644
--- a/server/server.go
+++ b/server/server.go
@@ -240,7 +240,7 @@ func (slf *Server) Run(addr string) error {
 					PushErrorMessage(slf, err, MessageErrorActionShutdown)
 				}
 			} else {
-				if err := slf.httpServer.ListenAndServe(); err != nil && errors.Is(err, http.ErrServerClosed) {
+				if err := slf.httpServer.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
 					slf.isRunning = false
 					PushErrorMessage(slf, err, MessageErrorActionShutdown)
 				}