Merge pull request #753 from danielgerlag/sb-fix

Service Bus LifeCycle listener to use message handler instead of session handler

Author: danielgerlag

src/providers/WorkflowCore.Providers.Azure/Services/ServiceBusLifeCycleEventHub.cs

@@ -16,23 +16,20 @@ public class ServiceBusLifeCycleEventHub : ILifeCycleEventHub
         private readonly ITopicClient _topicClient;
         private readonly ILogger _logger;
         private readonly ISubscriptionClient _subscriptionClient;
-        private readonly ICollection<Action<LifeCycleEvent>> _subscribers =
-            new HashSet<Action<LifeCycleEvent>>();
-        private readonly JsonSerializerSettings _serializerSettings =
-            new JsonSerializerSettings
-            {
-                TypeNameHandling = TypeNameHandling.All,
-                ReferenceLoopHandling = ReferenceLoopHandling.Error,
-            };
+        private readonly ICollection<Action<LifeCycleEvent>> _subscribers = new HashSet<Action<LifeCycleEvent>>();
+        private readonly JsonSerializerSettings _serializerSettings = new JsonSerializerSettings
+        {
+            TypeNameHandling = TypeNameHandling.All,
+            ReferenceLoopHandling = ReferenceLoopHandling.Error,
+        };
 
         public ServiceBusLifeCycleEventHub(
             string connectionString,
             string topicName,
             string subscriptionName,
             ILoggerFactory logFactory)
         {
-            _subscriptionClient = new SubscriptionClient(
-                connectionString, topicName, subscriptionName);
+            _subscriptionClient = new SubscriptionClient(connectionString, topicName, subscriptionName);
             _topicClient = new TopicClient(connectionString, topicName);
             _logger = logFactory.CreateLogger(GetType());
         }
@@ -55,14 +52,12 @@ public void Subscribe(Action<LifeCycleEvent> action)
 
         public Task Start()
         {
-            var sessionHandlerOptions = new SessionHandlerOptions(ExceptionHandler)
+            var messageHandlerOptions = new MessageHandlerOptions(ExceptionHandler)
             {
-                MaxConcurrentSessions = 1,
                 AutoComplete = false
             };
 
-            _subscriptionClient.RegisterSessionHandler(
-                MessageHandler, sessionHandlerOptions);
+            _subscriptionClient.RegisterMessageHandler(MessageHandler, messageHandlerOptions);
 
             return Task.CompletedTask;
         }
@@ -73,10 +68,7 @@ public async Task Stop()
             await _subscriptionClient.CloseAsync();
         }
 
-        private async Task MessageHandler(
-            IMessageSession messageSession,
-            Message message,
-            CancellationToken cancellationToken)
+        private async Task MessageHandler(Message message, CancellationToken cancellationToken)
         {
             try
             {
@@ -92,15 +84,13 @@ await _subscriptionClient
             }
             catch
             {
-                await _subscriptionClient
-                    .AbandonAsync(message.SystemProperties.LockToken);
+                await _subscriptionClient.AbandonAsync(message.SystemProperties.LockToken);
             }
         }
 
         private Task ExceptionHandler(ExceptionReceivedEventArgs arg)
         {
-            _logger.LogWarning(
-                default, arg.Exception, "Error on receiving events");
+            _logger.LogWarning(default, arg.Exception, "Error on receiving events");
 
             return Task.CompletedTask;
         }

src/providers/WorkflowCore.Providers.Azure/WorkflowCore.Providers.Azure.csproj

@@ -7,15 +7,15 @@
 - Provides distributed lock management  on Workflow Core
 - Provides Queueing support  on Workflow Core</Description>
     <PackageTags>workflow workflowcore dlm</PackageTags>
-    <Version>3.0.0</Version>
+    <Version>3.1.0</Version>
     <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.3' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
     <PackageProjectUrl>https://github.com/danielgerlag/workflow-core</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/danielgerlag/workflow-core/blob/master/LICENSE.md</PackageLicenseUrl>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/danielgerlag/workflow-core.git</RepositoryUrl>
     <Authors>Daniel Gerlag</Authors>
-    <AssemblyVersion>3.0.0.0</AssemblyVersion>
-    <FileVersion>3.0.0.0</FileVersion>
+    <AssemblyVersion>3.1.0.0</AssemblyVersion>
+    <FileVersion>3.1.0.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>