formatting and reduce logging

conductor-sdk · Jan 2, 2024 · 1a0b38e · 1a0b38e
1 parent 2e13cdd
commit 1a0b38e
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 23 deletions.
diff --git a/Conductor/Client/Worker/WorkflowTaskExecutor.cs b/Conductor/Client/Worker/WorkflowTaskExecutor.cs
@@ -76,8 +76,20 @@ private void Work4Ever(CancellationToken token)
 
                     WorkOnce(token);
                 }
+                catch (System.OperationCanceledException canceledException)
+                {
+                    //Do nothing the operation was cancelled
+                    _logger.LogTrace(
+                        $"[{_workerSettings.WorkerId}] Operation Cancelled: {canceledException.Message}"
+                        + $", taskName: {_worker.TaskType}"
+                        + $", domain: {_worker.WorkerSettings.Domain}"
+                        + $", batchSize: {_workerSettings.BatchSize}"
+                    );
+                    Sleep(SLEEP_FOR_TIME_SPAN_ON_WORKER_ERROR);
+                }
                 catch (Exception e)
                 {
+
                     _logger.LogError(
                         $"[{_workerSettings.WorkerId}] worker error: {e.Message}"
                         + $", taskName: {_worker.TaskType}"
@@ -130,28 +142,20 @@ private async void WorkOnce(CancellationToken token)
                 return new List<Task>();
             }
 
-            try
-            {
-                var tasks = _taskClient.PollTask(_worker.TaskType, _workerSettings.WorkerId, _workerSettings.Domain,
-                    availableWorkerCounter);
-                if (tasks == null)
-                {
-                    tasks = new List<Models.Task>();
-                }
-
-                _logger.LogTrace(
-                    $"[{_workerSettings.WorkerId}] Polled {tasks.Count} tasks"
-                    + $", taskType: {_worker.TaskType}"
-                    + $", domain: {_workerSettings.Domain}"
-                    + $", batchSize: {_workerSettings.BatchSize}"
-                );
-                return tasks;
-            }
-            catch (Exception e)
+            var tasks = _taskClient.PollTask(_worker.TaskType, _workerSettings.WorkerId, _workerSettings.Domain,
+                availableWorkerCounter);
+            if (tasks == null)
             {
-                _logger.LogError($"Error polling for {_worker.TaskType}.  Error = {e.Message}");
-                return new List<Task>();
+                tasks = new List<Models.Task>();
             }
+
+            _logger.LogTrace(
+                $"[{_workerSettings.WorkerId}] Polled {tasks.Count} tasks"
+                + $", taskType: {_worker.TaskType}"
+                + $", domain: {_workerSettings.Domain}"
+                + $", batchSize: {_workerSettings.BatchSize}"
+            );
+            return tasks;
         }
 
         private async void ProcessTasks(List<Models.Task> tasks, CancellationToken token)

diff --git a/Tests/Worker/WorkerTests.cs b/Tests/Worker/WorkerTests.cs
@@ -58,8 +58,7 @@ private async System.Threading.Tasks.Task<ConcurrentBag<string>> StartWorkflows(
 
         private async System.Threading.Tasks.Task ExecuteWorkflowTasks(TimeSpan workflowCompletionTimeout)
         {
-            var host = WorkflowTaskHost.CreateWorkerHost(Microsoft.Extensions.Logging.LogLevel.Debug);
-            host = WorkflowTaskHost.CreateWorkerHost(Microsoft.Extensions.Logging.LogLevel.Debug, new ClassWorker());
+            var host = WorkflowTaskHost.CreateWorkerHost(Microsoft.Extensions.Logging.LogLevel.Information, new ClassWorker());
             await host.StartAsync();
             Thread.Sleep(workflowCompletionTimeout);
             await host.StopAsync();

diff --git a/Tests/Worker/Workers.cs b/Tests/Worker/Workers.cs
@@ -30,7 +30,6 @@ public static TaskResult SimpleWorker(Conductor.Client.Models.Task task)
         public TaskResult LazyWorker(Conductor.Client.Models.Task task)
         {
             var timeSpan = System.TimeSpan.FromMilliseconds(_random.Next(128, 2048));
-            Console.WriteLine($"Lazy worker is going to rest for {timeSpan.Milliseconds} ms");
             System.Threading.Tasks.Task.Delay(timeSpan).GetAwaiter().GetResult();
             return task.Completed();
         }