Переглянути джерело

replace console log by logger

Robert 1 рік тому
батько
коміт
3e1662d0f6

+ 1 - 1
EVCB_OCPP.WSServer/Jobs/HeartBeatCheckJob.cs

@@ -63,7 +63,7 @@ public class HeartBeatCheckJob : IJob
         }
         catch (Exception ex)
         {
-            Console.WriteLine("***********************************************************");
+            logger.LogError("***********************************************************");
             logger.LogError(string.Format("HeartBeatCheckTrigger  Ex:{0}", ex.ToString()));
         }
     }

+ 8 - 8
EVCB_OCPP.WSServer/Message/CoreProfileHandler.cs

@@ -471,7 +471,7 @@ internal partial class ProfileHandler
                             catch (Exception ex)
                             {
 
-                                Console.WriteLine(string.Format("{0} :{1}", session.ChargeBoxId + " RunningCost", ex.Message));
+                                logger.LogCritical(string.Format("{0} :{1}", session.ChargeBoxId + " RunningCost", ex.Message));
 
                             }
 
@@ -907,7 +907,7 @@ internal partial class ProfileHandler
                     break;
                 default:
                     {
-                        Console.WriteLine(string.Format("Not Implement {0} Logic(ExecuteCoreRequest)", request.GetType().ToString().Replace("OCPPPackage.Messages.Core.", "")));
+                        logger.LogWarning(string.Format("Not Implement {0} Logic(ExecuteCoreRequest)", request.GetType().ToString().Replace("OCPPPackage.Messages.Core.", "")));
                     }
                     break;
             }
@@ -1089,7 +1089,7 @@ internal partial class ProfileHandler
                                         var tx = await db.TransactionRecord.Where(x => x.Id == txEnergy.TxId).FirstOrDefaultAsync();
                                         if (tx == null)
                                         {
-                                            Console.WriteLine("Tx is empty");
+                                            logger.LogTrace("Tx is empty");
                                             return result;
                                         }
 
@@ -1272,7 +1272,7 @@ internal partial class ProfileHandler
                                                 //{ "to","jessica_tseng@phihong.com.tw"}
                                            }, null);
 
-                                            Console.WriteLine(JsonConvert.SerializeObject(mail_response));
+                                            logger.LogTrace(JsonConvert.SerializeObject(mail_response));
 
                                         }
                                         #endregion
@@ -1523,7 +1523,7 @@ internal partial class ProfileHandler
                                         string oldValue = string.Empty;
                                         if (item.key == null)
                                         {
-                                            Console.WriteLine("*********************");
+                                            logger.LogTrace("*********************");
                                         }
                                         var foundConfig = configure.Find(x => x.ConfigureName == item.key);
 
@@ -1532,7 +1532,7 @@ internal partial class ProfileHandler
                                         {
                                             if (foundConfig.ConfigureName == null)
                                             {
-                                                Console.WriteLine("*********************");
+                                                logger.LogWarning("*********************");
                                             }
 
                                             if (foundConfig.ConfigureName == "SecurityProfile")
@@ -1627,7 +1627,7 @@ internal partial class ProfileHandler
                     break;
                 default:
                     {
-                        Console.WriteLine(string.Format("Not Implement {0} Logic(ExecuteCoreConfirm)", confirm.GetType().ToString().Replace("OCPPPackage.Messages.Core.", "")));
+                        logger.LogWarning(string.Format("Not Implement {0} Logic(ExecuteCoreConfirm)", confirm.GetType().ToString().Replace("OCPPPackage.Messages.Core.", "")));
                     }
                     break;
             }
@@ -1684,7 +1684,7 @@ internal partial class ProfileHandler
 
             default:
                 {
-                    Console.WriteLine(string.Format("Not Implement {0} Logic(ReceivedCoreError)", action));
+                    logger.LogWarning(string.Format("Not Implement {0} Logic(ReceivedCoreError)", action));
                 }
                 break;
         }

+ 3 - 3
EVCB_OCPP.WSServer/Message/FirmwareManagementProfileHandler.cs

@@ -124,7 +124,7 @@ namespace EVCB_OCPP.WSServer.Message
 
                     default:
                         {
-                            Console.WriteLine(string.Format("Not Implement {0} Logic", request.GetType().ToString().Replace("OCPPPackage.Messages.FirmwareManagement.", "")));
+                            logger.LogWarning(string.Format("Not Implement {0} Logic", request.GetType().ToString().Replace("OCPPPackage.Messages.FirmwareManagement.", "")));
                         }
                         break;
                 }
@@ -173,7 +173,7 @@ namespace EVCB_OCPP.WSServer.Message
                     break;
                 default:
                     {
-                        Console.WriteLine(string.Format("Not Implement {0} Logic", confirm.GetType().ToString().Replace("OCPPPackage.Messages.FirmwareManagement.", "")));
+                        logger.LogWarning(string.Format("Not Implement {0} Logic", confirm.GetType().ToString().Replace("OCPPPackage.Messages.FirmwareManagement.", "")));
                     }
                     break;
             }
@@ -212,7 +212,7 @@ namespace EVCB_OCPP.WSServer.Message
 
                 default:
                     {
-                        Console.WriteLine(string.Format("Not Implement {0} Logic", action));
+                        logger.LogWarning(string.Format("Not Implement {0} Logic", action));
                     }
                     break;
             }

+ 3 - 2
EVCB_OCPP.WSServer/Message/LocalAuthListManagementProfileHandler.cs

@@ -3,6 +3,7 @@ using EVCB_OCPP.Packet.Features;
 using EVCB_OCPP.Packet.Messages;
 using EVCB_OCPP.Packet.Messages.LocalAuthListManagement;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
 using OCPPServer.Protocol;
 using System;
 using System.Linq;
@@ -60,7 +61,7 @@ namespace EVCB_OCPP.WSServer.Message
                     break;
                 default:
                     {
-                        Console.WriteLine(string.Format("Not Implement {0} Logic", confirm.GetType().ToString().Replace("OCPPPackage.Messages.RemoteTrigger.", "")));
+                        logger.LogWarning(string.Format("Not Implement {0} Logic", confirm.GetType().ToString().Replace("OCPPPackage.Messages.RemoteTrigger.", "")));
                     }
                     break;
             }
@@ -96,7 +97,7 @@ namespace EVCB_OCPP.WSServer.Message
 
                 default:
                     {
-                        Console.WriteLine(string.Format("Not Implement {0} Logic", action));
+                        logger.LogWarning(string.Format("Not Implement {0} Logic", action));
                     }
                     break;
             }

+ 3 - 2
EVCB_OCPP.WSServer/Message/RemoteTriggerHandler.cs

@@ -3,6 +3,7 @@ using EVCB_OCPP.Packet.Features;
 using EVCB_OCPP.Packet.Messages;
 using EVCB_OCPP.Packet.Messages.RemoteTrigger;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
 using OCPPServer.Protocol;
 using System;
 using System.Linq;
@@ -42,7 +43,7 @@ namespace EVCB_OCPP.WSServer.Message
                     break;
                 default:
                     {
-                        Console.WriteLine(string.Format("Not Implement {0} Logic", confirm.GetType().ToString().Replace("OCPPPackage.Messages.RemoteTrigger.", "")));
+                        logger.LogWarning(string.Format("Not Implement {0} Logic", confirm.GetType().ToString().Replace("OCPPPackage.Messages.RemoteTrigger.", "")));
                     }
                     break;
             }
@@ -77,7 +78,7 @@ namespace EVCB_OCPP.WSServer.Message
 
                 default:
                     {
-                        Console.WriteLine(string.Format("Not Implement {0} Logic", action));
+                        logger.LogWarning(string.Format("Not Implement {0} Logic", action));
                     }
                     break;
             }

+ 3 - 2
EVCB_OCPP.WSServer/Message/ReservationProfileHandler.cs

@@ -3,6 +3,7 @@ using EVCB_OCPP.Packet.Features;
 using EVCB_OCPP.Packet.Messages;
 using EVCB_OCPP.Packet.Messages.Reservation;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
 using OCPPServer.Protocol;
 using System;
 using System.Linq;
@@ -62,7 +63,7 @@ namespace EVCB_OCPP.WSServer.Message
                     break;
                 default:
                     {
-                        Console.WriteLine(string.Format("Not Implement {0} Logic", confirm.GetType().ToString().Replace("OCPPPackage.Messages.RemoteTrigger.", "")));
+                        logger.LogWarning(string.Format("Not Implement {0} Logic", confirm.GetType().ToString().Replace("OCPPPackage.Messages.RemoteTrigger.", "")));
                     }
                     break;
             }
@@ -116,7 +117,7 @@ namespace EVCB_OCPP.WSServer.Message
 
                 default:
                     {
-                        Console.WriteLine(string.Format("Not Implement {0} Logic", action));
+                        logger.LogWarning(string.Format("Not Implement {0} Logic", action));
                     }
                     break;
             }

+ 3 - 3
EVCB_OCPP.WSServer/Message/SecurityProfileHandler.cs

@@ -20,7 +20,7 @@ namespace EVCB_OCPP.WSServer.Message
 
                     default:
                         {
-                            Console.WriteLine(string.Format("Not Implement {0} Logic(ExecuteCoreRequest)", request.GetType().ToString().Replace("OCPPPackage.Messages.Core.", "")));
+                            logger.LogWarning(string.Format("Not Implement {0} Logic(ExecuteCoreRequest)", request.GetType().ToString().Replace("OCPPPackage.Messages.Core.", "")));
                         }
                         break;
                 }
@@ -46,7 +46,7 @@ namespace EVCB_OCPP.WSServer.Message
 
                 default:
                     {
-                        Console.WriteLine(string.Format("Not Implement {0} Logic", confirm.GetType().ToString().Replace("OCPPPackage.Messages.RemoteTrigger.", "")));
+                        logger.LogWarning(string.Format("Not Implement {0} Logic", confirm.GetType().ToString().Replace("OCPPPackage.Messages.RemoteTrigger.", "")));
                     }
                     break;
             }
@@ -63,7 +63,7 @@ namespace EVCB_OCPP.WSServer.Message
 
                 default:
                     {
-                        Console.WriteLine(string.Format("Not Implement {0} Logic", action));
+                        logger.LogWarning(string.Format("Not Implement {0} Logic", action));
                     }
                     break;
             }

+ 3 - 2
EVCB_OCPP.WSServer/Message/SmartChargingProfileHandler.cs

@@ -5,6 +5,7 @@ using EVCB_OCPP.Packet.Messages;
 using EVCB_OCPP.Packet.Messages.SmartCharging;
 using EVCB_OCPP.Packet.Messages.SubTypes;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using OCPPServer.Protocol;
 using System;
@@ -139,7 +140,7 @@ namespace EVCB_OCPP.WSServer.Message
                     break;
                 default:
                     {
-                        Console.WriteLine(string.Format("Not Implement {0} Logic", confirm.GetType().ToString().Replace("OCPPPackage.Messages.RemoteTrigger.", "")));
+                        logger.LogWarning(string.Format("Not Implement {0} Logic", confirm.GetType().ToString().Replace("OCPPPackage.Messages.RemoteTrigger.", "")));
                     }
                     break;
             }
@@ -177,7 +178,7 @@ namespace EVCB_OCPP.WSServer.Message
 
                 default:
                     {
-                        Console.WriteLine(string.Format("Not Implement {0} Logic", action));
+                        logger.LogWarning(string.Format("Not Implement {0} Logic", action));
                     }
                     break;
             }