|
@@ -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,
|