lith vor 3 Jahren
Ursprung
Commit
97f1df9f74
24 geänderte Dateien mit 28 neuen und 28 gelöschten Zeilen
  1. 1 1
      dotnet/Library/Sers/Sers.CL/Ipc/Sers.CL.Ipc.NamedPipe/DeliveryClient.cs
  2. 1 1
      dotnet/Library/Sers/Sers.CL/Ipc/Sers.CL.Ipc.NamedPipe/DeliveryServer.cs
  3. 1 1
      dotnet/Library/Sers/Sers.CL/Ipc/Sers.CL.Ipc.SharedMemory/DeliveryClient.cs
  4. 1 1
      dotnet/Library/Sers/Sers.CL/Ipc/Sers.CL.Ipc.SharedMemory/DeliveryServer.cs
  5. 1 1
      dotnet/Library/Sers/Sers.CL/Socket/Sers.CL.Socket.Iocp/Mode/Simple/DeliveryClient.cs
  6. 1 1
      dotnet/Library/Sers/Sers.CL/Socket/Sers.CL.Socket.Iocp/Mode/Simple/DeliveryServer.cs
  7. 1 1
      dotnet/Library/Sers/Sers.CL/Socket/Sers.CL.Socket.Iocp/Mode/ThreadWait/DeliveryClient.cs
  8. 1 1
      dotnet/Library/Sers/Sers.CL/Socket/Sers.CL.Socket.Iocp/Mode/ThreadWait/DeliveryServer.cs
  9. 1 1
      dotnet/Library/Sers/Sers.CL/Socket/Sers.CL.Socket.Iocp/Mode/Timer/DeliveryClient.cs
  10. 1 1
      dotnet/Library/Sers/Sers.CL/Socket/Sers.CL.Socket.Iocp/Mode/Timer/DeliveryServer.cs
  11. 1 1
      dotnet/Library/Sers/Sers.CL/Socket/Sers.CL.Socket.ThreadWait/DeliveryClient.cs
  12. 1 1
      dotnet/Library/Sers/Sers.CL/Socket/Sers.CL.Socket.ThreadWait/DeliveryServer.cs
  13. 1 1
      dotnet/Library/Sers/Sers.CL/WebSocket/Sers.CL.WebSocket/DeliveryClient.cs
  14. 1 1
      dotnet/Library/Sers/Sers.CL/WebSocket/Sers.CL.WebSocket/DeliveryServer.cs
  15. 1 1
      dotnet/Library/Sers/Sers.CL/Zmq/FullDuplex/Sers.CL.Zmq.FullDuplex/DeliveryClient.cs
  16. 1 1
      dotnet/Library/Sers/Sers.CL/Zmq/FullDuplex/Sers.CL.Zmq.FullDuplex/DeliveryServer.cs
  17. 1 1
      dotnet/Library/Sers/Sers.CL/Zmq/ThreadWait/Sers.CL.ClrZmq.ThreadWait/DeliveryClient.cs
  18. 1 1
      dotnet/Library/Sers/Sers.CL/Zmq/ThreadWait/Sers.CL.ClrZmq.ThreadWait/DeliveryServer.cs
  19. 1 1
      dotnet/Library/Sers/Sers.Core/Sers.Core/CL/MessageOrganize/DefaultOrganize/OrganizeServer.cs
  20. 2 2
      dotnet/Library/Sers/Sers.Core/Sers.Core/Module/Api/LocalApi/ApiTrace/ApiTracePublisher.cs
  21. 1 1
      dotnet/Library/Sers/Sers.Core/Sers.Core/Module/Api/LocalApi/LocalApiService/LocalApiService.cs
  22. 2 2
      dotnet/ServiceCenter/Sers.ServiceCenter/Sers.Gover/Base/AppEvent/ApiTracePublisher.cs
  23. 2 2
      dotnet/ServiceCenter/Sers.ServiceCenter/Sers.Gover/Base/GoverApiCenterService.cs
  24. 2 2
      dotnet/ServiceCenter/Sers.ServiceCenter/Sers.ServiceCenter/ServiceCenter.cs

+ 1 - 1
dotnet/Library/Sers/Sers.CL/Ipc/Sers.CL.Ipc.NamedPipe/DeliveryClient.cs

@@ -36,7 +36,7 @@ namespace Sers.CL.Ipc.NamedPipe
 
         public bool Connect()
         {
-            Logger.Info("[CL.DeliveryClient] Ipc.NamedPipe, connecting", new { serverName, pipeName });
+            Logger.Info("[CL.DeliveryClient] Ipc.NamedPipe, connecting", new { serverName = serverName, pipeName = pipeName });
 
             NamedPipeClientStream client;
             try

+ 1 - 1
dotnet/Library/Sers/Sers.CL/Ipc/Sers.CL.Ipc.NamedPipe/DeliveryServer.cs

@@ -49,7 +49,7 @@ namespace Sers.CL.Ipc.NamedPipe
         {
             try
             {
-                Logger.Info("[CL.DeliveryServer] Ipc.NamedPipe, starting", new { pipeName });
+                Logger.Info("[CL.DeliveryServer] Ipc.NamedPipe, starting", new { pipeName = pipeName });
 
                 #region (x.1)检测命名管道是否已经在使用
                 try

+ 1 - 1
dotnet/Library/Sers/Sers.CL/Ipc/Sers.CL.Ipc.SharedMemory/DeliveryClient.cs

@@ -44,7 +44,7 @@ namespace Sers.CL.Ipc.SharedMemory
         public bool Connect()
         {
 
-            Logger.Info("[CL.Ipc] Ipc.SharedMemory,connecting", new { name });
+            Logger.Info("[CL.Ipc] Ipc.SharedMemory,connecting", new { name = name });
 
             if (!_conn.InitAsClient(name))
             {

+ 1 - 1
dotnet/Library/Sers/Sers.CL/Ipc/Sers.CL.Ipc.SharedMemory/DeliveryServer.cs

@@ -81,7 +81,7 @@ namespace Sers.CL.Ipc.SharedMemory
 
         public bool Start()
         {
-            Logger.Info("[CL.Ipc] Ipc.SharedMemory,starting", new { name });
+            Logger.Info("[CL.Ipc] Ipc.SharedMemory,starting", new { name = name });
 
 
             if (!_conn.InitAsServer(name, nodeCount, nodeBufferSize))

+ 1 - 1
dotnet/Library/Sers/Sers.CL/Socket/Sers.CL.Socket.Iocp/Mode/Simple/DeliveryClient.cs

@@ -12,7 +12,7 @@ namespace Sers.CL.Socket.Iocp.Mode.Simple
         {
             try
             {
-                Logger.Info("[CL.DeliveryClient] Socket.Iocp,connecting", new { host, port });
+                Logger.Info("[CL.DeliveryClient] Socket.Iocp,connecting", new { host = host, port = port });
 
 
                 if (!base.Connect()) 

+ 1 - 1
dotnet/Library/Sers/Sers.CL/Socket/Sers.CL.Socket.Iocp/Mode/Simple/DeliveryServer.cs

@@ -12,7 +12,7 @@ namespace Sers.CL.Socket.Iocp.Mode.Simple
         {  
             try
             {
-                Logger.Info("[CL.DeliveryServer] Socket.Iocp,starting", new { host, port });
+                Logger.Info("[CL.DeliveryServer] Socket.Iocp,starting", new { host = host, port = port });
 
                 if (!base.Start()) 
                 {

+ 1 - 1
dotnet/Library/Sers/Sers.CL/Socket/Sers.CL.Socket.Iocp/Mode/ThreadWait/DeliveryClient.cs

@@ -38,7 +38,7 @@ namespace Sers.CL.Socket.Iocp.Mode.ThreadWait
         {
             try
             {
-                Logger.Info("[CL.DeliveryClient] Socket.Iocp,connecting", new { host, port });
+                Logger.Info("[CL.DeliveryClient] Socket.Iocp,connecting", new { host = host, port = port });
 
 
                 if (!base.Connect())

+ 1 - 1
dotnet/Library/Sers/Sers.CL/Socket/Sers.CL.Socket.Iocp/Mode/ThreadWait/DeliveryServer.cs

@@ -37,7 +37,7 @@ namespace Sers.CL.Socket.Iocp.Mode.ThreadWait
         {
             try
             {
-                Logger.Info("[CL.DeliveryServer] Socket.Iocp,starting", new { host, port });
+                Logger.Info("[CL.DeliveryServer] Socket.Iocp,starting", new { host = host, port = port });
 
                 if (!base.Start())
                 {

+ 1 - 1
dotnet/Library/Sers/Sers.CL/Socket/Sers.CL.Socket.Iocp/Mode/Timer/DeliveryClient.cs

@@ -35,7 +35,7 @@ namespace Sers.CL.Socket.Iocp.Mode.Timer
         {
             try
             {
-                Logger.Info("[CL.DeliveryClient] Socket.Iocp,connecting", new { host, port });
+                Logger.Info("[CL.DeliveryClient] Socket.Iocp,connecting", new { host = host, port = port });
 
 
                 if (!base.Connect())

+ 1 - 1
dotnet/Library/Sers/Sers.CL/Socket/Sers.CL.Socket.Iocp/Mode/Timer/DeliveryServer.cs

@@ -37,7 +37,7 @@ namespace Sers.CL.Socket.Iocp.Mode.Timer
         {
             try
             {
-                Logger.Info("[CL.DeliveryServer] Socket.Iocp,starting", new { host, port });
+                Logger.Info("[CL.DeliveryServer] Socket.Iocp,starting", new { host = host, port = port });
 
                 if (!base.Start())
                 {

+ 1 - 1
dotnet/Library/Sers/Sers.CL/Socket/Sers.CL.Socket.ThreadWait/DeliveryClient.cs

@@ -35,7 +35,7 @@ namespace Sers.CL.Socket.ThreadWait
 
         public bool Connect()
         {
-            Logger.Info("[CL.DeliveryClient] Socket.ThreadWait,connecting", new { host, port });
+            Logger.Info("[CL.DeliveryClient] Socket.ThreadWait,connecting", new { host = host, port = port });
             TcpClient client = null;
             try
             {

+ 1 - 1
dotnet/Library/Sers/Sers.CL/Socket/Sers.CL.Socket.ThreadWait/DeliveryServer.cs

@@ -62,7 +62,7 @@ namespace Sers.CL.Socket.ThreadWait
             {
                 if (listener != null) return false;
 
-                Logger.Info("[CL.DeliveryServer] Socket.ThreadWait,starting", new { host, port });
+                Logger.Info("[CL.DeliveryServer] Socket.ThreadWait,starting", new { host = host, port = port });
 
                 // IPEndPoint类将网络标识为IP地址和端口号
                 IPEndPoint localEndPoint = new IPEndPoint(String.IsNullOrEmpty(host) ? IPAddress.Any : NetHelp.ParseToIPAddress(host), port);

+ 1 - 1
dotnet/Library/Sers/Sers.CL/WebSocket/Sers.CL.WebSocket/DeliveryClient.cs

@@ -31,7 +31,7 @@ namespace Sers.CL.WebSocket
         {
             try
             {
-                Logger.Info("[CL.DeliveryClient] WebSocket,connecting", new { host });
+                Logger.Info("[CL.DeliveryClient] WebSocket,connecting", new { host = host });
 
                 ClientWebSocket _webSocket = new ClientWebSocket();
                 _webSocket.ConnectAsync(new Uri(host), new CancellationToken()).GetAwaiter().GetResult();

+ 1 - 1
dotnet/Library/Sers/Sers.CL/WebSocket/Sers.CL.WebSocket/DeliveryServer.cs

@@ -36,7 +36,7 @@ namespace Sers.CL.WebSocket
 
             try
             {
-                Logger.Info("[CL.DeliveryServer] WebSocket,starting", new { host });
+                Logger.Info("[CL.DeliveryServer] WebSocket,starting", new { host = host });
 
                 connMap.Clear();
 

+ 1 - 1
dotnet/Library/Sers/Sers.CL/Zmq/FullDuplex/Sers.CL.Zmq.FullDuplex/DeliveryClient.cs

@@ -43,7 +43,7 @@ namespace Sers.CL.Zmq.FullDuplex
             try
             {
 
-                Logger.Info("[CL.DeliveryClient] Zmq.FullDuplex,connecting", new { endpoint });
+                Logger.Info("[CL.DeliveryClient] Zmq.FullDuplex,connecting", new { endpoint = endpoint });
 
                 //(x.1)
                 _conn.OnSendFrameAsync = SendMessageAsync;

+ 1 - 1
dotnet/Library/Sers/Sers.CL/Zmq/FullDuplex/Sers.CL.Zmq.FullDuplex/DeliveryServer.cs

@@ -43,7 +43,7 @@ namespace Sers.CL.Zmq.FullDuplex
         {
             try
             {
-                Logger.Info("[CL.DeliveryServer] Zmq.FullDuplex,starting", new { endpoint });
+                Logger.Info("[CL.DeliveryServer] Zmq.FullDuplex,starting", new { endpoint = endpoint });
 
                 //(x.1) create zmq conn
                 socketRouter = new ZSocket(ZSocketType.ROUTER);

+ 1 - 1
dotnet/Library/Sers/Sers.CL/Zmq/ThreadWait/Sers.CL.ClrZmq.ThreadWait/DeliveryClient.cs

@@ -42,7 +42,7 @@ namespace Sers.CL.ClrZmq.ThreadWait
             try
             {
 
-                Logger.Info("[CL.DeliveryClient] Zmq.ThreadWait,connecting", new { endpoint });
+                Logger.Info("[CL.DeliveryClient] Zmq.ThreadWait,connecting", new { endpoint = endpoint });
 
                 //(x.1)
                 _conn.OnSendFrameAsync = Zmq_SendMessageAsync;

+ 1 - 1
dotnet/Library/Sers/Sers.CL/Zmq/ThreadWait/Sers.CL.ClrZmq.ThreadWait/DeliveryServer.cs

@@ -44,7 +44,7 @@ namespace Sers.CL.ClrZmq.ThreadWait
         {
             try
             {
-                Logger.Info("[CL.DeliveryServer] Zmq.ThreadWait,starting", new { endpoint });
+                Logger.Info("[CL.DeliveryServer] Zmq.ThreadWait,starting", new { endpoint = endpoint });
 
                 //(x.1) create zmq conn
                 var socket = new ZSocket(ZSocketType.ROUTER);

+ 1 - 1
dotnet/Library/Sers/Sers.Core/Sers.Core/CL/MessageOrganize/DefaultOrganize/OrganizeServer.cs

@@ -192,7 +192,7 @@ namespace Sers.Core.CL.MessageOrganize.DefaultOrganize
                 {
                     //验证不通过
                     deliveryConn.state = DeliveryConnState.waitForClose;
-                    Logger.Info("[CL.OrganizeServer] Authentication - failed", new { reqSecretKey });
+                    Logger.Info("[CL.OrganizeServer] Authentication - failed");
                     replyData = "false".SerializeToArraySegmentByte();
                     callback?.Invoke(sender, new Vit.Core.Util.Pipelines.ByteData(replyData));
                 }

+ 2 - 2
dotnet/Library/Sers/Sers.Core/Sers.Core/Module/Api/LocalApi/ApiTrace/ApiTracePublisher.cs

@@ -29,11 +29,11 @@ namespace Sers.Core.Module.Api.LocalApi.ApiTrace
 
             if (ApiTraceMng.collectorMap.TryGetValue(collectorName, out collector))
             {
-                Logger.Info("[LocalApiService.ApiTracePublisher]加载成功", new { collectorName });     
+                Logger.Info("[LocalApiService.ApiTracePublisher]加载成功", new { collectorName = collectorName });
             }
             else
             {
-                Logger.Info("[LocalApiService.ApiTracePublisher]加载失败,没有配置指定的collector", new { collectorName, Message = "请在appsettings.json中配置正确的Sers.ApiTrace.Collector" });
+                Logger.Info("[LocalApiService.ApiTracePublisher]加载失败,没有配置指定的collector", new { collectorName = collectorName, Message = "请在appsettings.json中配置正确的Sers.ApiTrace.Collector" });
             }
         }
 

+ 1 - 1
dotnet/Library/Sers/Sers.Core/Sers.Core/Module/Api/LocalApi/LocalApiService/LocalApiService.cs

@@ -180,7 +180,7 @@ namespace Sers.Core.Module.Api.LocalApi
                 if (threadCount > 0)
                 {
                     workThread.Start();
-                    Logger.Info("[LocalApiService] Started", new { threadCount });
+                    Logger.Info("[LocalApiService] Started", new { threadCount = threadCount });
 
                 }
                 return true;

+ 2 - 2
dotnet/ServiceCenter/Sers.ServiceCenter/Sers.Gover/Base/AppEvent/ApiTracePublisher.cs

@@ -52,11 +52,11 @@ namespace Sers.Gover.Base.AppEvent
             Logger.Info("[Gover.ApiTracePublisher]初始化中");
             if (ApiTraceMng.collectorMap.TryGetValue(collectorName, out collector))
             {
-                Logger.Info("[Gover.ApiTracePublisher]已绑定collector", new { collectorName });
+                Logger.Info("[Gover.ApiTracePublisher]已绑定collector", new { collectorName = collectorName });
             }
             else
             {
-                Logger.Info("[Gover.ApiTracePublisher]初始化失败,没有配置指定的collector", new { collectorName, Message = "请在appsettings.json中配置正确的Sers.ApiTrace.Collector" });
+                Logger.Info("[Gover.ApiTracePublisher]初始化失败,没有配置指定的collector", new { collectorName = collectorName, Message = "请在appsettings.json中配置正确的Sers.ApiTrace.Collector" });
             }
         }
 

+ 2 - 2
dotnet/ServiceCenter/Sers.ServiceCenter/Sers.Gover/Base/GoverApiCenterService.cs

@@ -342,13 +342,13 @@ namespace Sers.Gover.Base
 
         public bool ApiStation_Pause(string stationName)
         {
-            Logger.Info("[ApiCenterService]Pause ApiStation", new { stationName });
+            Logger.Info("[ApiCenterService]Pause ApiStation", new { stationName = stationName });
             return apiStationMng.ApiStation_Pause(stationName);
         }
 
         public bool ApiStation_Start(string stationName)
         {
-            Logger.Info("[ApiCenterService]Start ApiStation", new { stationName });
+            Logger.Info("[ApiCenterService]Start ApiStation", new { stationName = stationName });
             return apiStationMng.ApiStation_Start(stationName);
         }
         #endregion

+ 2 - 2
dotnet/ServiceCenter/Sers.ServiceCenter/Sers.ServiceCenter/ServiceCenter.cs

@@ -235,12 +235,12 @@ namespace Sers.ServiceCenter
 
             communicationManage.Conn_OnConnected = (IOrganizeConnection conn) =>
               {
-                  Logger.Info("[CL] OnConnected",new { conn.connTag });
+                  Logger.Info("[CL] OnConnected", new { connTag = conn.connTag });
               };
 
             communicationManage.Conn_OnDisconnected = (IOrganizeConnection conn) =>
             {
-                Logger.Info("[CL] OnDisconnected,connTag", new { conn.connTag });
+                Logger.Info("[CL] OnDisconnected", new { connTag = conn.connTag });
 
                 MessageCenterService.Instance.Conn_OnDisconnected(conn);