修复ws bug`

CloudmindsRobot · Jan 13, 2021 · ed41ab5 · ed41ab5
1 parent ed50c31
commit ed41ab5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/backend/controllers/query.go b/backend/controllers/query.go
@@ -540,22 +540,26 @@ func LokiTail(c *gin.Context) {
 	chanSendMessage := make(chan utils.WsMessage)
 	chanReceiveMessage := make(chan utils.WsMessage)
 	chanSignal := make(chan int)
-	defer close(chanSendMessage)
-	defer close(chanReceiveMessage)
 
 	go utils.WebSocketClientHandler(clientConnect, chanSendMessage, chanSignal)
 	go utils.WebSocketServerHandler(serverConnect, chanReceiveMessage, chanSignal)
 
 	for {
 		select {
-		case wsClientMessage := <-chanSendMessage:
+		case wsClientMessage, ok := <-chanSendMessage:
+			if !ok {
+				return
+			}
 			data := utils.LokiWebsocketMessageConstruct(wsClientMessage.Data, filters)
 			err := serverConnect.WriteMessage(wsClientMessage.MessageType, data)
 			if err != nil {
 				utils.Log4Zap(zap.ErrorLevel).Error(fmt.Sprintf("send message to viewer error, %s", err))
 				return
 			}
-		case wsServerMessage := <-chanReceiveMessage:
+		case wsServerMessage, ok := <-chanReceiveMessage:
+			if !ok {
+				return
+			}
 			data := string(wsServerMessage.Data)
 			if data == "close" {
 				return

diff --git a/backend/utils/lokiwebsocket.go b/backend/utils/lokiwebsocket.go
@@ -50,11 +50,13 @@ func WebSocketClientHandler(clientConnect *websocket.Conn, ch chan WsMessage, si
 				if timer != nil {
 					timer.Stop()
 				}
+				close(ch)
 				return
 			}
 		case <-timer.C:
 			messageType, data, err := clientConnect.ReadMessage()
 			if err != nil {
+				close(ch)
 				Log4Zap(zap.ErrorLevel).Error(fmt.Sprintf("read message from loki error, %s", err))
 				timer.Stop()
 				break
@@ -88,13 +90,15 @@ func WebSocketServerHandler(serverConnect *websocket.Conn, ch chan WsMessage, si
 	for {
 		messageType, data, err := serverConnect.ReadMessage()
 		if err != nil {
+			close(ch)
 			Log4Zap(zap.ErrorLevel).Error(fmt.Sprintf("read message from viewer error, %s", err))
 			return
 		}
 		if len(data) > 0 {
 			if string(data) == "close" {
 				signal <- 0
 				ch <- WsMessage{MessageType: messageType, Data: data}
+				close(ch)
 				return
 			}
 			ch <- WsMessage{MessageType: messageType, Data: data}

diff --git a/ui/src/components/BaseToolbar.vue b/ui/src/components/BaseToolbar.vue
@@ -116,6 +116,7 @@ a {
   color: inherit;
 }
 .zoom-menu {
-  left: 1760px !important;
+  right: 10px;
+  left: auto !important;
 }
 </style>