Skip to content

Commit 3a67356

Browse files
AlianBlankAlianBlank
committed
[增加] 增加日志打印的ActorId
1 parent 5c62847 commit 3a67356

File tree

8 files changed

+35
-22
lines changed

8 files changed

+35
-22
lines changed

‎GameFrameX.Hotfix/StartUp/AppStartUpHotfixGameByMain.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ protected override ValueTask OnDisconnected(IAppSession appSession, CloseEventAr
4747
protected override async ValueTask OnConnected(IAppSession appSession)
4848
{
4949
LogHelper.Info("有外部客户端网络连接成功！。链接信息：SessionID:" + appSession.SessionID + " RemoteEndPoint:" + appSession.RemoteEndPoint);
50-
var netChannel = new DefaultNetWorkChannel(appSession, Setting, null, appSession is WebSocketSession);
50+
var netChannel = new DefaultNetWorkChannel(appSession, Setting, null, appSession is WebSocketSession);
5151
var count = SessionManager.Count();
5252
if (count > Setting.MaxClientCount)
5353
{
@@ -77,11 +77,12 @@ protected override async ValueTask PackageHandler(IAppSession appSession, IMessa
7777
return;
7878
}
7979

80+
var actorId = netWorkChannel.GetData<long>(GlobalConst.ActorIdKey);
8081
if (outerNetworkMessage.Header.OperationType == MessageOperationType.HeartBeat)
8182
{
8283
if (Setting.IsDebug && Setting.IsDebugReceive && Setting.IsDebugReceiveHeartBeat)
8384
{
84-
LogHelper.Debug($"---收到{outerNetworkMessage.ToFormatMessageString()}");
85+
LogHelper.Debug($"---收到{outerNetworkMessage.ToFormatMessageString(actorId)}");
8586
}
8687

8788
// 心跳消息回复
@@ -91,7 +92,7 @@ protected override async ValueTask PackageHandler(IAppSession appSession, IMessa
9192

9293
if (Setting.IsDebug && Setting.IsDebugReceive)
9394
{
94-
LogHelper.Debug($"---收到{outerNetworkMessage.ToFormatMessageString()}");
95+
LogHelper.Debug($"---收到{outerNetworkMessage.ToFormatMessageString(actorId)}");
9596
}
9697

9798
var handler = HotfixManager.GetTcpHandler(outerNetworkMessage.Header.MessageId);

‎GameFrameX.NetWork.Abstractions/IMessage.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ public interface IMessage
88
/// <summary>
99
/// 获取格式化后的消息字符串
1010
/// </summary>
11-
/// <returns></returns>
12-
string ToFormatMessageString();
11+
/// <param name="actorId">ActorId</param>
12+
/// <returns>格式化后的消息字符串</returns>
13+
string ToFormatMessageString(long actorId = default);
1314
}

‎GameFrameX.NetWork/BaseNetWorkChannel.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,18 +87,19 @@ public virtual async Task WriteAsync(INetworkMessage messageObject, int errorCod
8787
var messageData = MessageHelper.EncoderHandler.Handler(messageObject);
8888
if (Setting.IsDebug && Setting.IsDebugSend)
8989
{
90+
var actorId = GetData<long>(GlobalConst.ActorIdKey);
9091
// 判断是否是心跳消息
9192
if (messageObject is IHeartBeatMessage)
9293
{
9394
// 判断是否打印心跳消息的发送
9495
if (Setting.IsDebugSendHeartBeat)
9596
{
96-
LogHelper.Debug($"---发送{messageObject.ToFormatMessageString()}");
97+
LogHelper.Debug($"---发送{messageObject.ToFormatMessageString(actorId)}");
9798
}
9899
}
99100
else
100101
{
101-
LogHelper.Debug($"---发送{messageObject.ToFormatMessageString()}");
102+
LogHelper.Debug($"---发送{messageObject.ToFormatMessageString(actorId)}");
102103
}
103104
}
104105

‎GameFrameX.NetWork/InnerNetworkMessage.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@ public void SetMessageData(byte[] messageData)
5151
MessageData = messageData;
5252
}
5353

54-
5554
/// <summary>
5655
/// 获取格式化后的消息字符串
5756
/// </summary>
58-
/// <returns></returns>
59-
public string ToFormatMessageString()
57+
/// <param name="actorId">ActorId</param>
58+
/// <returns>格式化后的消息字符串</returns>
59+
public string ToFormatMessageString(long actorId = default)
6060
{
61-
return MessageObjectLoggerHelper.FormatMessage(Header.MessageId, Header.OperationType, Header.UniqueId, DeserializeMessageObject());
61+
return MessageObjectLoggerHelper.FormatMessage(Header.MessageId, Header.OperationType, Header.UniqueId, DeserializeMessageObject(), actorId);
6262
}
6363

6464
/// <summary>

‎GameFrameX.NetWork/MessageObjectLoggerHelper.cs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ public static class MessageObjectLoggerHelper
2525
/// <param name="operationType">操作类型</param>
2626
/// <param name="uniqueId">唯一标识ID</param>
2727
/// <param name="messageObject">网络消息对象</param>
28+
/// <param name="actorId"></param>
2829
/// <returns>格式化后的消息字符串</returns>
29-
public static string FormatMessage(int messageId, MessageOperationType operationType, int uniqueId, INetworkMessage messageObject)
30+
public static string FormatMessage(int messageId, MessageOperationType operationType, int uniqueId, INetworkMessage messageObject, long actorId)
3031
{
3132
try
3233
{
@@ -49,6 +50,8 @@ public static string FormatMessage(int messageId, MessageOperationType operation
4950
stringBuilder.Append($"--UniqueId:[{uniqueId.ToString().CenterAlignedText(13)}]---");
5051
// 消息的内容 分割
5152
stringBuilder.AppendLine();
53+
// 消息的ActorId内容
54+
stringBuilder.AppendLine(actorId.ToString().CenterAlignedText(140));
5255
// 消息内容
5356
stringBuilder.AppendLine($"{messageObject.ToJsonString()}");
5457
// 向上的箭头
@@ -59,7 +62,7 @@ public static string FormatMessage(int messageId, MessageOperationType operation
5962
}
6063

6164
// 非控制台输出模式下，将消息序列化为JSON格式
62-
var messageObjectLogObject = new MessageObjectLogObject(messageObject.GetType().Name, messageId, operationType, uniqueId, messageObject);
65+
var messageObjectLogObject = new MessageObjectLogObject(messageObject.GetType().Name, messageId, operationType, uniqueId, messageObject, actorId);
6366
var json = JsonHelper.Serialize(messageObjectLogObject);
6467
return json;
6568
}

‎GameFrameX.NetWork/Messages/MessageObject.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ public void SetMessageId(int messageId)
5555
[JsonIgnore]
5656
public int UniqueId { get; set; }
5757

58-
5958
/// <summary>
6059
/// 更新唯一消息ID
6160
/// </summary>
@@ -76,10 +75,11 @@ public void SetUniqueId(int uniqueId)
7675
/// <summary>
7776
/// 获取格式化后的消息字符串
7877
/// </summary>
79-
/// <returns></returns>
80-
public string ToFormatMessageString()
78+
/// <param name="actorId">ActorId</param>
79+
/// <returns>格式化后的消息字符串</returns>
80+
public string ToFormatMessageString(long actorId = default)
8181
{
82-
return MessageObjectLoggerHelper.FormatMessage(MessageId, OperationType, UniqueId, this);
82+
return MessageObjectLoggerHelper.FormatMessage(MessageId, OperationType, UniqueId, this, actorId);
8383
}
8484

8585
/// <summary>

‎GameFrameX.NetWork/Messages/MessageObjectLogObject.cs‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,27 @@ public sealed class MessageObjectLogObject
2121
/// <param name="operationType"></param>
2222
/// <param name="uniqueId"></param>
2323
/// <param name="messageObject"></param>
24-
public MessageObjectLogObject(string name, int messageId, MessageOperationType operationType, int uniqueId, INetworkMessage messageObject)
24+
/// <param name="actorId"></param>
25+
public MessageObjectLogObject(string name, int messageId, MessageOperationType operationType, int uniqueId, INetworkMessage messageObject, long actorId)
2526
{
2627
MessageType = name;
2728
MessageId = messageId;
2829
OpType = operationType;
2930
UniqueId = uniqueId;
3031
Data = messageObject;
32+
ActorId = actorId;
3133
}
3234

3335
/// <summary>
3436
/// 消息类型
3537
/// </summary>
3638
public string MessageType { get; set; }
3739

40+
/// <summary>
41+
/// ActorId
42+
/// </summary>
43+
public long ActorId { get; set; }
44+
3845
/// <summary>
3946
/// 消息ID
4047
/// </summary>

‎GameFrameX.NetWork/OuterNetworkMessage.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,14 @@ public void SetMessageData(byte[] messageData)
5858
MessageData = messageData;
5959
}
6060

61-
6261
/// <summary>
6362
/// 获取格式化后的消息字符串
6463
/// </summary>
65-
/// <returns></returns>
66-
public string ToFormatMessageString()
64+
/// <param name="actorId">ActorId</param>
65+
/// <returns>格式化后的消息字符串</returns>
66+
public string ToFormatMessageString(long actorId = default)
6767
{
68-
return MessageObjectLoggerHelper.FormatMessage(Header.MessageId, Header.OperationType, Header.UniqueId, DeserializeMessageObject());
68+
return MessageObjectLoggerHelper.FormatMessage(Header.MessageId, Header.OperationType, Header.UniqueId, DeserializeMessageObject(), actorId);
6969
}
7070

7171
/// <summary>

0 commit comments

Comments
 (0)