diff --git a/src/MessageHandlers/LinkRequestHandler.cs b/src/MessageHandlers/LinkRequestHandler.cs index eff9556..37ef86f 100644 --- a/src/MessageHandlers/LinkRequestHandler.cs +++ b/src/MessageHandlers/LinkRequestHandler.cs @@ -50,7 +50,7 @@ private void LinkRequestHandler(MessageFormats.HostServices.Link.LinkRequest? me _fileMoverService.QueueFileMove(returnResponse); - _logger.LogDebug("Sending response type '{messageType}' to '{appId}' (trackingId: '{trackingId}' / correlationId: '{correlationId}')", returnResponse.GetType().Name, fullMessage.SourceAppId, returnResponse.ResponseHeader.TrackingId, returnResponse.ResponseHeader.CorrelationId); + _logger.LogDebug("Sending response type '{messageType}' to '{appId}' (trackingId: '{trackingId}' / correlationId: '{correlationId}' / status: '{status}')", returnResponse.GetType().Name, fullMessage.SourceAppId, returnResponse.ResponseHeader.TrackingId, returnResponse.ResponseHeader.CorrelationId, returnResponse.ResponseHeader.Status); // Route the response back to the calling user _client.DirectToApp(appId: fullMessage.SourceAppId, message: returnResponse); diff --git a/src/Services/FileMoverService.cs b/src/Services/FileMoverService.cs index d921832..087e06b 100644 --- a/src/Services/FileMoverService.cs +++ b/src/Services/FileMoverService.cs @@ -245,10 +245,10 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) { /// void protected internal void QueueFileMove(MessageFormats.HostServices.Link.LinkResponse linkResponse) { try { - _logger.LogTrace("Adding LinkRequest to queue. (trackingId: '{trackingId}' / correlationId: '{correlationId}')", linkResponse.ResponseHeader.TrackingId, linkResponse.ResponseHeader.CorrelationId); + _logger.LogTrace("Adding LinkRequest to queue. (trackingId: '{trackingId}' / correlationId: '{correlationId}' / status: '{status}')", linkResponse.ResponseHeader.TrackingId, linkResponse.ResponseHeader.CorrelationId, linkResponse.ResponseHeader.Status); _linkResponseQueue.Add(linkResponse); } catch (Exception ex) { - _logger.LogError("Failure storing LinkRequest to queue (trackingId: '{trackingId}' / correlationId: '{correlationId}'). Error: {errorMessage}", linkResponse.ResponseHeader.TrackingId, linkResponse.ResponseHeader.CorrelationId, ex.Message); + _logger.LogError("Failure storing LinkRequest to queue (trackingId: '{trackingId}' / correlationId: '{correlationId}' / status '{status}'). Error: {errorMessage}", linkResponse.ResponseHeader.TrackingId, linkResponse.ResponseHeader.CorrelationId, linkResponse.ResponseHeader.Status, ex.Message); } } @@ -260,7 +260,7 @@ private Task SendResponseToApps(MessageFormats.HostServices.Link.LinkResponse me return Task.Run(async () => { MessageFormats.HostServices.Link.LinkResponse? pluginResponse = message; MessageFormats.HostServices.Link.LinkRequest? pluginRequest = message.LinkRequest; - _logger.LogDebug("Passing message '{messageType}' and '{responseType}' to plugins (trackingId: '{trackingId}' / correlationId: '{correlationId}')", message.GetType().Name, message.LinkRequest.GetType().Name, message.ResponseHeader.TrackingId, message.ResponseHeader.CorrelationId); + _logger.LogDebug("Passing message '{messageType}' and '{responseType}' to plugins (trackingId: '{trackingId}' / correlationId: '{correlationId}' / status: '{status}')", message.GetType().Name, message.LinkRequest.GetType().Name, message.ResponseHeader.TrackingId, message.ResponseHeader.CorrelationId, message.ResponseHeader.Status); (MessageFormats.HostServices.Link.LinkRequest? output_request, MessageFormats.HostServices.Link.LinkResponse? output_response) = _pluginLoader.CallPlugins( @@ -268,10 +268,10 @@ private Task SendResponseToApps(MessageFormats.HostServices.Link.LinkResponse me pluginDelegate: _pluginDelegates.LinkResponse); - _logger.LogDebug("Plugins finished processing '{messageType}' and '{responseType}' (trackingId: '{trackingId}' / correlationId: '{correlationId}')", message.GetType().Name, message.LinkRequest.GetType().Name, message.ResponseHeader.TrackingId, message.ResponseHeader.CorrelationId); + _logger.LogDebug("Plugins finished processing '{messageType}' and '{responseType}' (trackingId: '{trackingId}' / correlationId: '{correlationId}' / status: '{status}')", message.GetType().Name, message.LinkRequest.GetType().Name, message.ResponseHeader.TrackingId, message.ResponseHeader.CorrelationId, message.ResponseHeader.Status); if (output_response == null || output_request == null) { - _logger.LogInformation("Plugins nullified '{messageType}' or '{output_requestMessageType}'. Dropping Message (trackingId: '{trackingId}' / correlationId: '{correlationId}')", message.LinkRequest.GetType().Name, message.GetType().Name, message.ResponseHeader.TrackingId, message.ResponseHeader.CorrelationId); + _logger.LogInformation("Plugins nullified '{messageType}' or '{output_requestMessageType}'. Dropping Message (trackingId: '{trackingId}' / correlationId: '{correlationId}' / status: '{status}')", message.LinkRequest.GetType().Name, message.GetType().Name, message.ResponseHeader.TrackingId, message.ResponseHeader.CorrelationId, message.ResponseHeader.Status); return; } @@ -284,7 +284,7 @@ private Task SendResponseToApps(MessageFormats.HostServices.Link.LinkResponse me return; } - _logger.LogInformation("Sending successful '{messageType}' to '{sourceAppId}' and '{destinationAppId}' (trackingId: '{trackingId}' / correlationId: '{correlationId}')", message.GetType().Name, message.LinkRequest.RequestHeader.AppId, message.LinkRequest.DestinationAppId, message.ResponseHeader.TrackingId, message.ResponseHeader.CorrelationId); + _logger.LogInformation("Sending successful '{messageType}' to '{sourceAppId}' and '{destinationAppId}' (trackingId: '{trackingId}' / correlationId: '{correlationId}' / status: '{status}')", message.GetType().Name, message.LinkRequest.RequestHeader.AppId, message.LinkRequest.DestinationAppId, message.ResponseHeader.TrackingId, message.ResponseHeader.CorrelationId, message.ResponseHeader.Status); await _client.DirectToApp(appId: message.LinkRequest.RequestHeader.AppId, message: message); await _client.DirectToApp(appId: message.LinkRequest.DestinationAppId, message: message); });