From c007db9648da0e9af05ba930395ab8ffba43270c Mon Sep 17 00:00:00 2001 From: Wadim Hamm Date: Mon, 13 Jul 2026 10:16:39 +0200 Subject: [PATCH] Add logging to EventService --- .../EntityFrameworkPersistenceService.cs | 2 +- src/AasxServerStandardBib/EventService.cs | 34 +++++++++++-------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/AasxServerDB/EntityFrameworkPersistenceService.cs b/src/AasxServerDB/EntityFrameworkPersistenceService.cs index e4ffb74a..603bb810 100644 --- a/src/AasxServerDB/EntityFrameworkPersistenceService.cs +++ b/src/AasxServerDB/EntityFrameworkPersistenceService.cs @@ -536,7 +536,7 @@ public async Task DoDbOperation(DbRequest dbRequest) var submodelElement = CrudOperator.ReadSubmodelElementByPath(db, aasIdentifier, submodelIdentifier, idShort, out SMESet smE, securitySqlConditions); if (submodelElement == null) { - throw new NotFoundException($"Submodel with id {submodelIdentifier} NOT found in AAS with id {aasIdentifier}"); + throw new NotFoundException($"Submodel element in Submodel with id {submodelIdentifier} NOT found in AAS with id {aasIdentifier}"); } result.ResultData = new List diff --git a/src/AasxServerStandardBib/EventService.cs b/src/AasxServerStandardBib/EventService.cs index b6ab8b36..544f499e 100644 --- a/src/AasxServerStandardBib/EventService.cs +++ b/src/AasxServerStandardBib/EventService.cs @@ -31,6 +31,7 @@ namespace AasxServerStandardBib; using AasxServer; using AasxServerDB; using AasxServerDB.Entities; +using AasxServerStandardBib.Logging; using AdminShellNS; using Contracts; using Contracts.Events; @@ -38,10 +39,13 @@ namespace AasxServerStandardBib; using IdentityModel.Client; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Diagnostics; +using Microsoft.Extensions.Logging; using Microsoft.IdentityModel.Tokens; public class EventService : IEventService -{ +{ + private static readonly ILogger _logger = ApplicationLogging.CreateLogger("EventService"); + public EventService(MqttClientService mqttClientService) { _mqttClientService = mqttClientService; @@ -419,7 +423,7 @@ public async void PublishMqttMessage(EventDto eventData, string submodelId, stri if (result != null && result.IsSuccess) { isSucceeded = true; - Console.WriteLine($"MQTT message sent on message topic {eventData.MessageTopicType.Value}."); + _logger.LogDebug($"MQTT message sent on message topic {eventData.MessageTopicType.Value}."); } if (isSucceeded) @@ -492,7 +496,7 @@ public async void PublishMqttMessage(EventDto eventData, string submodelId, stri var now = DateTime.UtcNow; eventData.Status.SetTimeStamp(now); - Console.WriteLine($"FAILED: Send MQTT message on message topic {eventData.MessageTopicType.Value}."); + _logger.LogDebug($"FAILED: Send MQTT message on message topic {eventData.MessageTopicType.Value}."); // d = eventData.LastUpdate.Value = "reconnect"; } @@ -965,8 +969,8 @@ private List CollectPayloadForRestApi(SqlConditions? securitySqlCo entry.data = ConvertSmJsonToRestApiSpecSmJson(j); } } - } - + } + _logger.LogDebug($"Event id: {entry.id}, Type: {entry.type}"); eventPayloadList.Add(entry); } } @@ -1335,7 +1339,7 @@ public List CollectPayload(SqlConditions? securitySqlConditions, b eventPayloadList.Add(entry); diffEntry.Add(entry.eventPayloadEntryType.ToString() + " " + entry.GetIdShortPath()); - Console.WriteLine($"Event {entry.eventPayloadEntryType.ToString()} Schema: {entry.dataSchema} idShortPath: {entry.GetIdShortPath()}"); + _logger.LogDebug($"Event {entry.eventPayloadEntryType.ToString()} Schema: {entry.dataSchema} idShortPath: {entry.GetIdShortPath()}"); countSME++; } } @@ -1391,7 +1395,7 @@ public List CollectPayload(SqlConditions? securitySqlConditions, b } diffEntry.Add(entry.eventPayloadEntryType.ToString() + " " + entry.GetIdShortPath()); - Console.WriteLine($"Event {entry.eventPayloadEntryType.ToString()} Type: {entry.dataSchema} idShortPath: {entry.GetIdShortPath()}"); + _logger.LogDebug($"Event {entry.eventPayloadEntryType.ToString()} Type: {entry.dataSchema} idShortPath: {entry.GetIdShortPath()}"); eventPayloadList.Add(entry); countSM++; @@ -1475,7 +1479,7 @@ public int ChangeData(string json, EventDto eventData, AdminShellPackageEnv[] en } catch (Exception ex) { - Console.WriteLine(ex.ToString()); + _logger.LogDebug(ex.ToString()); } transmit = eventPayload[0].transmitted; var dt = TimeStamp.TimeStamp.StringToDateTime(eventPayload[0].time); @@ -1516,7 +1520,7 @@ public int ChangeData(string json, EventDto eventData, AdminShellPackageEnv[] en var entriesSubmodel = new List(); foreach (var entry in eventPayload) { - Console.WriteLine($"Event {entry.eventPayloadEntryType.ToString()} Type: {entry.dataSchema} idShortPath: {entry.GetIdShortPath()}"); + _logger.LogDebug($"Event {entry.eventPayloadEntryType.ToString()} Type: {entry.dataSchema} idShortPath: {entry.GetIdShortPath()}"); Submodel receiveSM = null; if (entry.dataSchema.Split("/")?.Last().ToLower() == "submodel") { @@ -1751,7 +1755,7 @@ private int ChangeSubmodelElement(EventDto eventData, EventPayload entry, IRefer } if (!path.Contains(".")) { - Console.WriteLine("Event CREATE SME: " + entry.GetIdShortPath()); + _logger.LogDebug("Event CREATE SME: " + entry.GetIdShortPath()); receiveSme.TimeStampCreate = dt; receiveSme.TimeStampDelete = new DateTime(); int i = 0; @@ -1805,7 +1809,7 @@ private int ChangeSubmodelElement(EventDto eventData, EventPayload entry, IRefer var sme = submodelElements[i]; if (entry.GetIdShortPath() == idShortPath + sme.IdShort) { - Console.WriteLine("Event UPDATE SME: " + entry.GetIdShortPath()); + _logger.LogDebug("Event UPDATE SME: " + entry.GetIdShortPath()); receiveSme.TimeStampCreate = submodelElements[i].TimeStampCreate; receiveSme.TimeStampDelete = submodelElements[i].TimeStampDelete; submodelElements[i] = receiveSme; @@ -1849,7 +1853,7 @@ private int ChangeSubmodelElement(EventDto eventData, EventPayload entry, IRefer } if (entry.GetIdShortPath() == idShortPath + sme.IdShort) { - Console.WriteLine("Event DELETE SME: " + entry.GetIdShortPath()); + _logger.LogDebug("Event DELETE SME: " + entry.GetIdShortPath()); if (children.Count != 0) { int c = 0; @@ -2031,12 +2035,12 @@ public EventDto ParseData(Operation op, AdminShellPackageEnv env) var url = System.Environment.GetEnvironmentVariable(envVarName); if (url != null) { - Console.WriteLine($"{p.Value} = {url}"); + _logger.LogDebug($"{p.Value} = {url}"); p.Value = url; } else { - Console.WriteLine($"Environment variable {envVarName} not found."); + _logger.LogWarning($"Environment variable {envVarName} not found."); } } eventDto.EndPoint = p; @@ -2447,7 +2451,7 @@ public async void NotifyDeleted(ISubmodel submodel, string idShortPath, string s if (result != null && result.IsSuccess) { isSucceeded = true; - Console.WriteLine("MQTT message sent."); + _logger.LogDebug("MQTT message sent."); } if (isSucceeded)