Merge pull request #237 from taosdata/enh/xftan/TS-4129-3.0

enh: free message after poll
taosdata · Nov 24, 2023 · 199626b · 199626b
2 parents 369eb70 + d43e860
commit 199626b
Show file tree

Hide file tree

Showing 10 changed files with 166 additions and 819 deletions.
diff --git a/controller/ws/query/ws.go b/controller/ws/query/ws.go
@@ -13,7 +13,6 @@ import (
 	"unsafe"
 
 	"github.com/gin-gonic/gin"
-	"github.com/gorilla/websocket"
 	"github.com/huskar-t/melody"
 	"github.com/sirupsen/logrus"
 	"github.com/taosdata/driver-go/v3/common/parser"
@@ -179,13 +178,7 @@ func NewQueryController() *QueryController {
 	})
 
 	queryM.HandleError(func(session *melody.Session, err error) {
-		logger := session.MustGet("logger").(*logrus.Entry)
-		_, is := err.(*websocket.CloseError)
-		if is {
-			logger.WithError(err).Debugln("ws close in error")
-		} else {
-			logger.WithError(err).Errorln("ws error")
-		}
+		wstool.LogWSError(session, err)
 		t, exist := session.Get(TaosSessionKey)
 		if exist && t != nil {
 			t.(*Taos).Close()

diff --git a/controller/ws/schemaless/schemaless.go b/controller/ws/schemaless/schemaless.go
@@ -95,9 +95,13 @@ func NewSchemalessController() *SchemalessController {
 
 	schemaless.HandleError(func(session *melody.Session, err error) {
 		logger := session.MustGet("logger").(*logrus.Entry)
-		_, is := err.(*websocket.CloseError)
+		wsCloseErr, is := err.(*websocket.CloseError)
 		if is {
-			logger.WithError(err).Debugln("ws close in error")
+			if wsCloseErr.Code == websocket.CloseNormalClosure {
+				logger.Debugln("ws close normal")
+			} else {
+				logger.WithError(err).Debugln("ws close in error")
+			}
 		} else {
 			logger.WithError(err).Errorln("ws error")
 		}

diff --git a/controller/ws/stmt/stmt.go b/controller/ws/stmt/stmt.go
@@ -14,7 +14,6 @@ import (
 	"unsafe"
 
 	"github.com/gin-gonic/gin"
-	"github.com/gorilla/websocket"
 	"github.com/huskar-t/melody"
 	"github.com/sirupsen/logrus"
 	"github.com/taosdata/driver-go/v3/common"
@@ -216,13 +215,7 @@ func NewSTMTController() *STMTController {
 	})
 
 	stmtM.HandleError(func(session *melody.Session, err error) {
-		logger := session.MustGet("logger").(*logrus.Entry)
-		_, is := err.(*websocket.CloseError)
-		if is {
-			logger.WithError(err).Debugln("ws close in error")
-		} else {
-			logger.WithError(err).Errorln("ws error")
-		}
+		wstool.LogWSError(session, err)
 		t, exist := session.Get(TaosStmtKey)
 		if exist && t != nil {
 			t.(*TaosStmt).Close()