diff --git a/bin/hallserver/config/hallserver.cluster.json b/bin/hallserver/config/hallserver.cluster.json index acd326ae..477514f6 100644 --- a/bin/hallserver/config/hallserver.cluster.json +++ b/bin/hallserver/config/hallserver.cluster.json @@ -1,7 +1,7 @@ [ { "instance_id": 1, - "listen_port": 8888, - "http_listen_port": 8889 + "listen_port": 8898, + "http_listen_port": 8899 } ] diff --git a/bin/hallserver/config/master.cluster.json b/bin/hallserver/config/master.cluster.json index 566617fe..4bf175f6 100644 --- a/bin/hallserver/config/master.cluster.json +++ b/bin/hallserver/config/master.cluster.json @@ -2,6 +2,6 @@ { "instance_id": 1, "ip": "192.168.100.45", - "listen_port": 7821 + "listen_port": 7921 } ] diff --git a/server/hallserver/app/app.go b/server/hallserver/app/app.go index 79ce4c49..9ee7b3df 100644 --- a/server/hallserver/app/app.go +++ b/server/hallserver/app/app.go @@ -57,11 +57,16 @@ func (this *app) Update() { } else { handler := cs.GetNetMsgHandler(hdr.MsgId) if handler != nil { + if !f5.IsOnlineEnv() { + f5.GetSysLog().Info("%s %s", q5.GetTypeName(hdr.Msg), q5.EncodeJson(hdr.Msg)) + } switch handler.HandlerId { case constant.PLAYER_MGR_HANDLER_ID: + fallthrough case constant.PLAYER_HANDLER_ID: GetPlayerMgr().ProcessCMMsg(handler, hdr) case constant.ROOM_HANDLER_ID: + fallthrough case constant.ROOM_MGR_HANDLER_ID: GetRoomMgr().ProcessCMMsg(handler, hdr) } diff --git a/server/hallserver/listener/wsplistener.go b/server/hallserver/listener/wsplistener.go index a9bc0c2c..38dcae23 100644 --- a/server/hallserver/listener/wsplistener.go +++ b/server/hallserver/listener/wsplistener.go @@ -154,6 +154,9 @@ func (this *WSPListener) parseNetPkt() { func (this *WSPListener) SendProxyMsg(conn net.Conn, socketHandle uint16, msg proto.Message) { netMsg := msg.(f5.NetMsg) + if !f5.IsOnlineEnv() { + f5.GetSysLog().Info("%s %s", q5.GetTypeName(msg), q5.EncodeJson(msg)) + } msgData, err := proto.Marshal(msg) if err != nil { return diff --git a/third_party/f5 b/third_party/f5 index 47db6c9c..05f5cced 160000 --- a/third_party/f5 +++ b/third_party/f5 @@ -1 +1 @@ -Subproject commit 47db6c9c60d59681e7fc02bd5649d7fe918b124e +Subproject commit 05f5ccedec312db465990b8f821125faea96ee78