From d3196eea22846d89e6f4a738c081cd98dbe152cd Mon Sep 17 00:00:00 2001
From: Sipke Schoorstra <sipkeschoorstra@outlook.com>
Date: Sat, 16 Jan 2021 12:52:08 +0100
Subject: [PATCH] Cleanup

---
 .../Services/QueueWorker.cs                   | 39 +++++++------------
 1 file changed, 14 insertions(+), 25 deletions(-)

diff --git a/src/activities/Elsa.Activities.AzureServiceBus/Services/QueueWorker.cs b/src/activities/Elsa.Activities.AzureServiceBus/Services/QueueWorker.cs
index 0fa76d89f..67a4c0116 100644
--- a/src/activities/Elsa.Activities.AzureServiceBus/Services/QueueWorker.cs
+++ b/src/activities/Elsa.Activities.AzureServiceBus/Services/QueueWorker.cs
@@ -40,41 +40,30 @@ namespace Elsa.Activities.AzureServiceBus.Services
         {
             using var scope = _serviceProvider.CreateScope();
             var workflowRunner = scope.ServiceProvider.GetRequiredService<IWorkflowRunner>();
-
-            if (string.IsNullOrWhiteSpace(message.CorrelationId))
-            {
-                await workflowRunner.TriggerWorkflowsAsync<MessageReceivedTrigger>(
-                    x => x.QueueName == _messageReceiver.Path && (x.CorrelationId == null),
-                    message,
-                    message.CorrelationId,
-                    cancellationToken: cancellationToken);
-            }
-            else
-            {
-                await workflowRunner.TriggerWorkflowsAsync<MessageReceivedTrigger>(
-                    x => x.QueueName == _messageReceiver.Path && x.CorrelationId == message.CorrelationId,
-                    message,
-                    message.CorrelationId,
-                    cancellationToken: cancellationToken);
-            }
+            
+            Func<MessageReceivedTrigger, bool> predicate = string.IsNullOrWhiteSpace(message.CorrelationId)
+                ? x => x.QueueName == _messageReceiver.Path && x.CorrelationId == null
+                : x => x.QueueName == _messageReceiver.Path && x.CorrelationId == message.CorrelationId;
+            
+            await workflowRunner.TriggerWorkflowsAsync(
+                predicate,
+                message,
+                message.CorrelationId,
+                cancellationToken: cancellationToken);
         }
 
         private Task ExceptionReceivedHandler(ExceptionReceivedEventArgs e)
         {
-            var context = e.ExceptionReceivedContext;
-
             switch (e.Exception)
             {
                 case MessageLockLostException:
+                    _logger.LogDebug( e.Exception,"Message lock lost");
+                    break;
                 case ServiceBusCommunicationException:
-                    _logger.LogDebug(e.Exception.Message);
+                    _logger.LogDebug(e.Exception, "Lost service bus communication");
                     break;
                 default:
-                    _logger.LogError("Message handler encountered an exception {Exception}.", e.Exception);
-                    _logger.LogError("Exception context for troubleshooting:");
-                    _logger.LogError("- Endpoint: {Endpoint}", context.Endpoint);
-                    _logger.LogError("- Entity Path: {EntityPath}", context.EntityPath);
-                    _logger.LogError("- Executing Action: {Action}", context.Action);
+                    _logger.LogError(e.Exception, "Unhandled exception");
                     break;
             }