Browse Source

add some print

Joyit 1 month ago
parent
commit
fd73e6dacc
3 changed files with 17 additions and 4 deletions
  1. 6 0
      conn/tcp2/tcp2.go
  2. 6 0
      conn/ws2/ws2.go
  3. 5 4
      hub.go

+ 6 - 0
conn/tcp2/tcp2.go

@@ -415,6 +415,9 @@ func (c *Tcp2) WriteRequest(id uint16, cmd string, data []byte) error {
 
 		if ok {
 			buf[index] = 0x01
+			if c.cf.PrintMsg {
+				log.Println("[CompressData]", len(data), "->", len(compressedData))
+			}
 		} else {
 			buf[index] = 0
 		}
@@ -456,6 +459,9 @@ func (c *Tcp2) WriteResponse(id uint16, state uint8, data []byte) error {
 
 		if ok {
 			buf[index] = 0x001
+			if c.cf.PrintMsg {
+				log.Println("[CompressData]", len(data), "->", len(compressedData))
+			}
 		} else {
 			buf[index] = 0
 		}

+ 6 - 0
conn/ws2/ws2.go

@@ -347,6 +347,9 @@ func (c *Ws2) WriteRequest(id uint16, cmd string, data []byte) error {
 
 		if ok {
 			buf[index] = 0x01
+			if c.cf.PrintMsg {
+				log.Println("[CompressData]", len(data), "->", len(compressedData))
+			}
 		} else {
 			buf[index] = 0
 		}
@@ -377,6 +380,9 @@ func (c *Ws2) WriteResponse(id uint16, state uint8, data []byte) error {
 		buf[2] = state | 0x80
 		if ok {
 			buf[3] = 0x01
+			if c.cf.PrintMsg {
+				log.Println("[CompressData]", len(data), "->", len(compressedData))
+			}
 		} else {
 			buf[3] = 0
 		}

+ 5 - 4
hub.go

@@ -268,7 +268,7 @@ func (h *Hub) sendRequest(gd *GetData) (count int) {
 				conn:     conn,
 			}
 			if h.cf.PrintMsg {
-				log.Println("[SEND]->", conn.channel, "["+gd.Cmd+"]", subStr(string(gd.Data), 200))
+				log.Println("[SEND]->", id, conn.channel, "["+gd.Cmd+"]", subStr(string(gd.Data), 200))
 			}
 			count++
 			if gd.Max > 0 && count >= gd.Max {
@@ -285,7 +285,7 @@ func (h *Hub) requestFromNet(request *RequestData) {
 	cmd := request.Cmd
 	channel := request.conn.channel
 	if h.cf.PrintMsg {
-		log.Println("[REQU]<-", channel, "["+cmd+"]", subStr(string(request.Data), 200))
+		log.Println("[REQU]<-", request.Id, channel, "["+cmd+"]", subStr(string(request.Data), 200))
 	}
 	// 执行中间件
 	for _, mdFunc := range h.middle {
@@ -325,7 +325,7 @@ func (h *Hub) requestFromNet(request *RequestData) {
 						Data:  data,
 					}
 					if h.cf.PrintMsg {
-						log.Println("[RESP]->", channel, "["+cmd+"]", state, subStr(string(data), 200))
+						log.Println("[RESP]->", request.Id, channel, "["+cmd+"]", state, subStr(string(data), 200))
 					}
 				}
 				return
@@ -386,7 +386,7 @@ func (h *Hub) GetWithMaxAndTimeout(channel *regexp.Regexp, cmd string, data []by
 			}
 			ch := rp.conn.channel
 			if h.cf.PrintMsg {
-				log.Println("[RECV]<-", ch, "["+gd.Cmd+"]", rp.State, subStr(string(rp.Data), 200))
+				log.Println("[RECV]<-", rp.Id, ch, "["+gd.Cmd+"]", rp.State, subStr(string(rp.Data), 200))
 			}
 			count++
 			// 如果这里返回为false这跳出循环
@@ -778,6 +778,7 @@ func NewHub(
 ) (h *Hub) {
 	h = &Hub{
 		cf:                   cf,
+		globalID:             uint16(time.Now().UnixNano()) % config.ID_MAX,
 		channel:              channel,
 		middle:               make([]MiddleFunc, 0),
 		connectHostFunc:      connectHostFunc,