From ab9eb1053205ed0588cdbd8a85b60e0794a64fc8 Mon Sep 17 00:00:00 2001 From: Neil South Date: Tue, 5 Sep 2023 09:31:36 +0100 Subject: [PATCH] fixup dupe logging Signed-off-by: Neil South --- src/WorkflowManager/Logging/Log.200000.Workflow.cs | 3 --- .../WorkflowExecuter/Services/WorkflowExecuterService.cs | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/WorkflowManager/Logging/Log.200000.Workflow.cs b/src/WorkflowManager/Logging/Log.200000.Workflow.cs index 8c9a73571..637062c9f 100644 --- a/src/WorkflowManager/Logging/Log.200000.Workflow.cs +++ b/src/WorkflowManager/Logging/Log.200000.Workflow.cs @@ -105,8 +105,5 @@ public static partial class Log [LoggerMessage(EventId = 210007, Level = LogLevel.Information, Message = "Exporting to MIG task Id {taskid}, export destination {destination} number of files {fileCount} Mig data plugins {plugins}.")] public static partial void LogMigExport(this ILogger logger, string taskid, string destination, int fileCount, string plugins); - - [LoggerMessage(EventId = 210008, Level = LogLevel.Information, Message = "Request canceld due to timeout taskId{taskid}.")] - public static partial void TaskTimedOut(this ILogger logger, string taskid); } } diff --git a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs index f9e114457..920728d5d 100644 --- a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs +++ b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs @@ -813,7 +813,7 @@ private async Task TimeOutEvent(WorkflowInstance workflowInstance, TaskExe var exportRequestEvent = EventMapper.GenerateTaskCancellationEvent("", taskExec.ExecutionId, workflowInstance.Id, taskExec.TaskId, FailureReason.TimedOut, "Timed out"); var jsonMesssage = new JsonMessage(exportRequestEvent, MessageBrokerConfiguration.WorkflowManagerApplicationId, correlationId, Guid.NewGuid().ToString()); - _logger.TaskTimedOut(taskExec.TaskId); + _logger.TaskTimedOut(taskExec.TaskId, workflowInstance.Id, taskExec.Timeout); await _messageBrokerPublisherService.Publish(TaskTimeoutRoutingKey, jsonMesssage.ToMessage()); return true; }