diff --git a/TIAMWebApp/Server/Services/DevAdminSignalRhub.cs b/TIAMWebApp/Server/Services/DevAdminSignalRhub.cs index 32fa75b1..020d3e7b 100644 --- a/TIAMWebApp/Server/Services/DevAdminSignalRhub.cs +++ b/TIAMWebApp/Server/Services/DevAdminSignalRhub.cs @@ -139,7 +139,8 @@ public class DevAdminSignalRHub : Hub, IAcSignalRHubServe public async Task OnReceiveMessage(int messageTag, byte[]? message, int? requestId) { - var logText = $"{ConstHelper.NameByValue(messageTag)} Server OnReceiveMessage; {nameof(requestId)}: {requestId}; ConnectionId: {Context.ConnectionId}; UserIdentifier: {Context.UserIdentifier}"; + var tagName = ConstHelper.NameByValue(messageTag); + var logText = $"Server OnReceiveMessage; {nameof(requestId)}: {requestId}; ConnectionId: {Context.ConnectionId}; {tagName}"; if (message is { Length: 0 }) _logger.Warning($"message.Length == 0! {logText}"); else _logger.Info(logText); @@ -152,11 +153,11 @@ public class DevAdminSignalRHub : Hub, IAcSignalRHubServe object[]? paramValues = null; - logText = $"{ConstHelper.NameByValue(messageTag)} Found dynamic method for the tag! method: {methodsByDeclaringObject.InstanceObject.GetType().Name}.{methodInfoModel.MethodInfo.Name}"; + logText = $"Found dynamic method for the tag! method: {methodsByDeclaringObject.InstanceObject.GetType().Name}.{methodInfoModel.MethodInfo.Name}"; if (methodInfoModel.ParamInfos is { Length: > 0 }) { - _logger.Debug($"{logText}({string.Join(", ", methodInfoModel.ParamInfos.Select(x => x.Name))})"); + _logger.Debug($"{logText}({string.Join(", ", methodInfoModel.ParamInfos.Select(x => x.Name))}); {tagName}"); paramValues = new object[methodInfoModel.ParamInfos.Length]; @@ -208,14 +209,14 @@ public class DevAdminSignalRHub : Hub, IAcSignalRHubServe } else paramValues[0] = message!.MessagePackTo>(MessagePackSerializerOptions.Standard).PostDataJson.JsonTo(firstParamType)!; } - else _logger.Debug($"{logText}()"); + else _logger.Debug($"{logText}(); {tagName}"); await ResponseToCaller(messageTag, new SignalResponseJsonMessage(SignalResponseStatus.Success, methodInfoModel.MethodInfo.InvokeMethod(methodsByDeclaringObject.InstanceObject, paramValues)), requestId); return; } - _logger.Debug($"{ConstHelper.NameByValue(messageTag)} Not found dynamic method for the tag! tag: {messageTag};"); + _logger.Debug($"Not found dynamic method for the tag! {tagName}"); switch (messageTag) { @@ -287,13 +288,13 @@ public class DevAdminSignalRHub : Hub, IAcSignalRHubServe // return; default: - _logger.Error($"{ConstHelper.NameByValue(messageTag)} Server OnReceiveMessage; messageTag not found!"); + _logger.Error($"Server OnReceiveMessage; messageTag not found! {tagName}"); break; } } catch (Exception ex) { - _logger.Error($"{ConstHelper.NameByValue(messageTag)} Server OnReceiveMessage; {ex.Message}", ex); + _logger.Error($"Server OnReceiveMessage; {ex.Message}; {tagName}", ex); } await ResponseToCaller(messageTag, new SignalResponseJsonMessage(SignalResponseStatus.Error), requestId); @@ -304,7 +305,7 @@ public class DevAdminSignalRHub : Hub, IAcSignalRHubServe protected async Task SendMessageToClient(ISignalRHubItemServer sendTo, int messageTag, ISignalRMessage message, int? requestId = null) { - _logger.Info($"{ConstHelper.NameByValue(messageTag)} Server SendMessageToClient; {nameof(requestId)}: {requestId}; ConnectionId: {Context.ConnectionId}; UserIdentifier: {Context.UserIdentifier}"); + _logger.Info($"Server SendMessageToClient; {nameof(requestId)}: {requestId}; ConnectionId: {Context.ConnectionId}; {ConstHelper.NameByValue(messageTag)}"); await sendTo.OnReceiveMessage(messageTag, message.ToMessagePack(ContractlessStandardResolver.Options), requestId); }