From dfa94cd1d98ba542b07bfdd061b10c7b05849953 Mon Sep 17 00:00:00 2001
From: Loretta <jozsef.b@aycode.com>
Date: Mon, 1 Jul 2024 18:32:45 +0200
Subject: [PATCH] fixes

---
 .../Services/AcSignalRClientBase.cs              | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/AyCode.Blazor.Components/Services/AcSignalRClientBase.cs b/AyCode.Blazor.Components/Services/AcSignalRClientBase.cs
index 1233e0b..6fdfa65 100644
--- a/AyCode.Blazor.Components/Services/AcSignalRClientBase.cs
+++ b/AyCode.Blazor.Components/Services/AcSignalRClientBase.cs
@@ -92,7 +92,7 @@ namespace AyCode.Blazor.Components.Services
 
         public virtual Task SendMessageToServerAsync(int messageTag, ISignalRMessage? message, int? requestId)
         {
-            Logger.DebugConditional($"{ConstHelper.NameByValue(_tagsName, messageTag)} Client SendMessageToServerAsync; {nameof(requestId)}: {requestId};");
+            Logger.DebugConditional($"Client SendMessageToServerAsync; {nameof(requestId)}: {requestId}; {ConstHelper.NameByValue(_tagsName, messageTag)}");
 
             return StartConnection().ContinueWith(_ =>
             {
@@ -137,7 +137,7 @@ namespace AyCode.Blazor.Components.Services
 
         protected virtual async Task<TResponse?> SendMessageToServerAsync<TResponse>(int messageTag, ISignalRMessage? message, int requestId) where TResponse : class
         {
-            Logger.DebugConditional($"{ConstHelper.NameByValue(_tagsName, messageTag)} Client SendMessageToServerAsync<TResult>; {nameof(requestId)}: {requestId};");
+            Logger.DebugConditional($"Client SendMessageToServerAsync<TResult>; {nameof(requestId)}: {requestId}; {ConstHelper.NameByValue(_tagsName, messageTag)}");
 
             _responseByRequestId[requestId] = new SignalRRequestModel();
             await SendMessageToServerAsync(messageTag, message, requestId);
@@ -163,7 +163,7 @@ namespace AyCode.Blazor.Components.Services
             }
             catch (Exception ex)
             {
-                Logger.Error($"{ConstHelper.NameByValue(_tagsName, messageTag)} SendMessageToServerAsync; requestId: {requestId}; {ex.Message}", ex);
+                Logger.Error($"SendMessageToServerAsync; requestId: {requestId}; {ex.Message}; {ConstHelper.NameByValue(_tagsName, messageTag)}", ex);
             }
 
             _responseByRequestId.TryRemove(requestId, out _);
@@ -188,7 +188,7 @@ namespace AyCode.Blazor.Components.Services
                 {
                     responseData = string.IsNullOrEmpty(responseMessage.ResponseData) ? default : responseMessage.ResponseData.JsonTo<TResponseData?>();
                 }
-                else Logger.Error($"{ConstHelper.NameByValue(_tagsName, messageTag)} Client SendMessageToServerAsync<TResponseData> response error; callback; Status: {responseMessage.Status}; requestId: {requestId};");
+                else Logger.Error($"Client SendMessageToServerAsync<TResponseData> response error; callback; Status: {responseMessage.Status}; requestId: {requestId}; {ConstHelper.NameByValue(_tagsName, messageTag)}");
 
                 responseCallback(new SignalResponseMessage<TResponseData?>(responseMessage.Status, responseData));
             }));
@@ -198,9 +198,9 @@ namespace AyCode.Blazor.Components.Services
 
         public virtual Task OnReceiveMessage(int messageTag, byte[] message, int? requestId)
         {
-            var logText = $"{ConstHelper.NameByValue(_tagsName, messageTag)} Client OnReceiveMessage; {nameof(requestId)}: {requestId};";
+            var logText = $"Client OnReceiveMessage; {nameof(requestId)}: {requestId}; {ConstHelper.NameByValue(_tagsName, messageTag)}";
 
-            if (message.Length == 0) Logger.Warning($"{logText} message.Length == 0!!!!");
+            if (message.Length == 0) Logger.Warning($"message.Length == 0! {logText}");
 
             try
             {
@@ -232,7 +232,7 @@ namespace AyCode.Blazor.Components.Services
                         //    return Task.CompletedTask;
 
                         default:
-                            Logger.Error($"{ConstHelper.NameByValue(_tagsName, messageTag)} Client OnReceiveMessage switch; unknown message type: {_responseByRequestId[reqId].ResponseByRequestId?.GetType().Name}");
+                            Logger.Error($"Client OnReceiveMessage switch; unknown message type: {_responseByRequestId[reqId].ResponseByRequestId?.GetType().Name}; {ConstHelper.NameByValue(_tagsName, messageTag)}");
                             break;
                     }
 
@@ -247,7 +247,7 @@ namespace AyCode.Blazor.Components.Services
                 if (requestId.HasValue)
                     _responseByRequestId.TryRemove(requestId.Value, out _);
 
-                Logger.Error($"{ConstHelper.NameByValue(_tagsName, messageTag)} Client OnReceiveMessage; requestId: {requestId}; {ex.Message}", ex);
+                Logger.Error($"Client OnReceiveMessage; requestId: {requestId}; {ex.Message}; {ConstHelper.NameByValue(_tagsName, messageTag)}", ex);
                 throw;
             }