Skip to content

Commit 5d82483

Browse files
authored
Merge pull request #15 from microsoft/al/logging
add status to response logging
2 parents 8293498 + a75925c commit 5d82483

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/MessageHandlers/LinkRequestHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ private void LinkRequestHandler(MessageFormats.HostServices.Link.LinkRequest? me
5050
_fileMoverService.QueueFileMove(returnResponse);
5151

5252

53-
_logger.LogDebug("Sending response type '{messageType}' to '{appId}' (trackingId: '{trackingId}' / correlationId: '{correlationId}')", returnResponse.GetType().Name, fullMessage.SourceAppId, returnResponse.ResponseHeader.TrackingId, returnResponse.ResponseHeader.CorrelationId);
53+
_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);
5454

5555
// Route the response back to the calling user
5656
_client.DirectToApp(appId: fullMessage.SourceAppId, message: returnResponse);

src/Services/FileMoverService.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -245,10 +245,10 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) {
245245
/// <returns>void</returns>
246246
protected internal void QueueFileMove(MessageFormats.HostServices.Link.LinkResponse linkResponse) {
247247
try {
248-
_logger.LogTrace("Adding LinkRequest to queue. (trackingId: '{trackingId}' / correlationId: '{correlationId}')", linkResponse.ResponseHeader.TrackingId, linkResponse.ResponseHeader.CorrelationId);
248+
_logger.LogTrace("Adding LinkRequest to queue. (trackingId: '{trackingId}' / correlationId: '{correlationId}' / status: '{status}')", linkResponse.ResponseHeader.TrackingId, linkResponse.ResponseHeader.CorrelationId, linkResponse.ResponseHeader.Status);
249249
_linkResponseQueue.Add(linkResponse);
250250
} catch (Exception ex) {
251-
_logger.LogError("Failure storing LinkRequest to queue (trackingId: '{trackingId}' / correlationId: '{correlationId}'). Error: {errorMessage}", linkResponse.ResponseHeader.TrackingId, linkResponse.ResponseHeader.CorrelationId, ex.Message);
251+
_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);
252252
}
253253
}
254254

@@ -260,18 +260,18 @@ private Task SendResponseToApps(MessageFormats.HostServices.Link.LinkResponse me
260260
return Task.Run(async () => {
261261
MessageFormats.HostServices.Link.LinkResponse? pluginResponse = message;
262262
MessageFormats.HostServices.Link.LinkRequest? pluginRequest = message.LinkRequest;
263-
_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);
263+
_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);
264264

265265
(MessageFormats.HostServices.Link.LinkRequest? output_request, MessageFormats.HostServices.Link.LinkResponse? output_response) =
266266
_pluginLoader.CallPlugins<MessageFormats.HostServices.Link.LinkRequest?, Plugins.PluginBase, MessageFormats.HostServices.Link.LinkResponse>(
267267
orig_request: pluginRequest, orig_response: pluginResponse,
268268
pluginDelegate: _pluginDelegates.LinkResponse);
269269

270270

271-
_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);
271+
_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);
272272

273273
if (output_response == null || output_request == null) {
274-
_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);
274+
_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);
275275
return;
276276
}
277277

@@ -284,7 +284,7 @@ private Task SendResponseToApps(MessageFormats.HostServices.Link.LinkResponse me
284284
return;
285285
}
286286

287-
_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);
287+
_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);
288288
await _client.DirectToApp(appId: message.LinkRequest.RequestHeader.AppId, message: message);
289289
await _client.DirectToApp(appId: message.LinkRequest.DestinationAppId, message: message);
290290
});

0 commit comments

Comments
 (0)