docs: 修复 server 在 WebSocket 模式下超时时间无效的问题

kercylan98 · Sep 19, 2023 · 1bc32e2 · 1bc32e2
1 parent 0cc8fd8
commit 1bc32e2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/server/server.go b/server/server.go
@@ -13,7 +13,6 @@ import (
 	"github.com/kercylan98/minotaur/utils/str"
 	"github.com/kercylan98/minotaur/utils/super"
 	"github.com/kercylan98/minotaur/utils/timer"
-	"github.com/kercylan98/minotaur/utils/times"
 	"github.com/panjf2000/ants/v2"
 	"github.com/panjf2000/gnet"
 	"github.com/panjf2000/gnet/pkg/logging"
@@ -319,13 +318,9 @@ func (slf *Server) Run(addr string) error {
 						conn.Close(e)
 					}
 				}()
-				var deadline = times.Zero
-				if slf.websocketReadDeadline > 0 {
-					deadline = time.Now().Add(slf.websocketReadDeadline)
-				}
 				for !conn.IsClosed() {
 					if slf.websocketReadDeadline > 0 {
-						if err := ws.SetReadDeadline(deadline); err != nil {
+						if err := ws.SetReadDeadline(time.Now().Add(slf.websocketReadDeadline)); err != nil {
 							panic(err)
 						}
 					}

diff --git a/utils/concurrent/pool.go b/utils/concurrent/pool.go
@@ -71,7 +71,13 @@ func (slf *Pool[T]) IsClose() bool {
 }
 
 func (slf *Pool[T]) Release(data T) {
+	slf.mutex.Lock()
+	if slf.releaser == nil {
+		slf.mutex.Unlock()
+		return
+	}
 	slf.releaser(data)
+	slf.mutex.Unlock()
 	slf.put(data)
 }