添加log字段serviceName

lmdkfs · Jun 4, 2019 · 580abee · 580abee
1 parent a9229ab
commit 580abee
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/pkg/api/controller.go b/pkg/api/controller.go
@@ -68,6 +68,7 @@ func (handler *streamHandler) Read(p []byte) (size int, err error) {
 	if err = json.Unmarshal(msg.Data, &xtermMsg); err != nil {
 		return
 	}
+
 	// web ssh 调整了终端大小
 	if xtermMsg.MsgType == "resize" {
 		// 放到channel里, 等remotecommand executor 调用我们的Next取走
@@ -78,6 +79,7 @@ func (handler *streamHandler) Read(p []byte) (size int, err error) {
 		copy(p, xtermMsg.Input)
 
 	}
+
 	return
 
 }

diff --git a/pkg/utils/logger.go b/pkg/utils/logger.go
@@ -94,6 +94,7 @@ func GinRus(logger loggerEntryWithfields, timeFormat string, utc bool) gin.Handl
 		}
 
 		entry := logger.WithFields(logrus.Fields{
+			"serviceName": "k8s-webshell",
 			"status":     c.Writer.Status(),
 			"method":     c.Request.Method,
 			"path":       requestPath,

diff --git a/pkg/ws/connection.go b/pkg/ws/connection.go
@@ -10,7 +10,7 @@ import (
 )
 
 var wsUpgrader = websocket.Upgrader{
-	ReadBufferSize: 16384,
+	ReadBufferSize:  16384,
 	WriteBufferSize: 16384,
 	// 允许所有CORS跨域访问
 	CheckOrigin: func(r *http.Request) bool {
@@ -55,7 +55,6 @@ func (wsConn *WsConnection) wsReadLoop() {
 			MessageType: msgType,
 			Data:        data,
 		}
-
 		select {
 		case wsConn.inChan <- msg:
 		case <-wsConn.closeChan: