Make queue clients consume methods async

Author: ethanhann

src/InEngine.Core/Queuing/Clients/FileClient.cs

@@ -3,6 +3,7 @@
 using System.IO;
 using System.Linq;
 using System.Threading;
+using System.Threading.Tasks;
 using InEngine.Core.Exceptions;
 using InEngine.Core.IO;
 using InEngine.Core.Queuing.Message;
@@ -55,15 +56,15 @@ private void PublishToQueue(CommandEnvelope commandEnvelope, string queuePath)
         );
     }
 
-    public void Consume(CancellationToken cancellationToken)
+    public async Task Consume(CancellationToken cancellationToken)
     {
         try
         {
             while (true)
             {
                 try
                 {
-                    if (Consume() == null)
+                    if (await Consume() == null)
                         Thread.Sleep(5000);
                 }
                 catch (Exception exception)
@@ -84,7 +85,7 @@ public void Consume(CancellationToken cancellationToken)
         }
     }
 
-    public ICommandEnvelope Consume()
+    public async Task<ICommandEnvelope> Consume()
     {
         FileInfo fileInfo;
         var inProgressFilePath = string.Empty;
@@ -116,7 +117,7 @@ public ICommandEnvelope Consume()
         try
         {
             command.WriteSummaryToConsole();
-            command.RunWithLifeCycleAsync().RunSynchronously();
+            await command.RunWithLifeCycleAsync();
         }
         catch (Exception exception)
         {

src/InEngine.Core/Queuing/Clients/RabbitMQClient.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 using System.Threading;
+using System.Threading.Tasks;
 using InEngine.Core.Exceptions;
 using InEngine.Core.IO;
 using InEngine.Core.Queuing.Message;
@@ -94,13 +95,18 @@ public void Recover()
     {
     }
 
-    public void Consume(CancellationToken cancellationToken)
+    public async Task Consume(CancellationToken cancellationToken)
     {
         InitChannel();
         var consumer = new EventingBasicConsumer(Channel);
-        consumer.Received += (model, result) =>
+        consumer.Received += async (model, result) =>
         {
             var eventingConsumer = (EventingBasicConsumer)model;
+            if (eventingConsumer == null)
+            {
+                Log.LogWarning("EventingBasicConsumer is null while attempting to consume messages");
+                return;
+            }
 
             var serializedMessage = Encoding.UTF8.GetString(result.Body);
             var commandEnvelope = serializedMessage.DeserializeFromJson<CommandEnvelope>();
@@ -115,7 +121,7 @@ public void Consume(CancellationToken cancellationToken)
             try
             {
                 command.WriteSummaryToConsole();
-                command.RunWithLifeCycleAsync().RunSynchronously();
+                await command.RunWithLifeCycleAsync();
             }
             catch (Exception exception)
             {
@@ -135,7 +141,7 @@ public void Consume(CancellationToken cancellationToken)
         Channel.BasicConsume(queue: PendingQueueName, autoAck: false, consumer: consumer);
     }
 
-    public ICommandEnvelope Consume()
+    public async Task<ICommandEnvelope> Consume()
     {
         InitChannel();
         var result = Channel.BasicGet(PendingQueueName, false);
@@ -155,7 +161,7 @@ public ICommandEnvelope Consume()
         try
         {
             command.WriteSummaryToConsole();
-            command.RunWithLifeCycleAsync().RunSynchronously();
+            await command.RunWithLifeCycleAsync();
         }
         catch (Exception exception)
         {

src/InEngine.Core/Queuing/Clients/RedisClient.cs

@@ -82,7 +82,7 @@ public void Recover()
             PublishToChannel();
     }
 
-    public void Consume(CancellationToken cancellationToken)
+    public async Task Consume(CancellationToken cancellationToken)
     {
         try
         {
@@ -104,7 +104,7 @@ public void Consume(CancellationToken cancellationToken)
         }
     }
 
-    public ICommandEnvelope Consume()
+    public async Task<ICommandEnvelope> Consume()
     {
         var rawRedisMessageValue = Redis.ListRightPopLeftPush(PendingQueueName, InProgressQueueName);
         var serializedMessage = rawRedisMessageValue.ToString();
@@ -122,7 +122,7 @@ public ICommandEnvelope Consume()
         try
         {
             command.WriteSummaryToConsole();
-            command.RunWithLifeCycleAsync().RunSynchronously();
+            await command.RunWithLifeCycleAsync();
         }
         catch (Exception exception)
         {

src/InEngine.Core/Queuing/Clients/SyncClient.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading;
+using System.Threading.Tasks;
 using InEngine.Core.IO;
 using InEngine.Core.Queuing.Message;
 
@@ -43,12 +44,12 @@ public void Recover()
     {
     }
 
-    public void Consume(CancellationToken cancellationToken)
+    public async Task Consume(CancellationToken cancellationToken)
     {
         throw new NotImplementedException();
     }
 
-    public ICommandEnvelope Consume()
+    public async Task<ICommandEnvelope> Consume()
     {
         throw new NotImplementedException();
     }

src/InEngine.Core/Queuing/IQueueClient.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Threading;
+using System.Threading.Tasks;
 using InEngine.Core.Queuing.Message;
 using InEngine.Core.IO;
 using Microsoft.Extensions.Logging;
@@ -16,8 +17,8 @@ public interface IQueueClient : IHasMailSettings, IDisposable
     string QueueName { get; set; }
     bool UseCompression { get; set; }
     void Publish(AbstractCommand command);
-    void Consume(CancellationToken cancellationToken);
-    ICommandEnvelope Consume();
+    Task Consume(CancellationToken cancellationToken);
+    Task<ICommandEnvelope> Consume();
     void Recover();
     Dictionary<string, long> GetQueueLengths();
     bool ClearPendingQueue();

src/InEngine.Core/Queuing/QueueAdapter.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading;
+using System.Threading.Tasks;
 using InEngine.Core.IO;
 using InEngine.Core.Queuing.Clients;
 using InEngine.Core.Queuing.Message;
@@ -89,8 +90,8 @@ public static QueueAdapter Make(bool useSecondaryQueue, QueueSettings queueSetti
     }
 
     public void Publish(AbstractCommand command) => QueueClient.Publish(command);
-    public void Consume(CancellationToken cancellationToken) => QueueClient.Consume(cancellationToken);
-    public ICommandEnvelope Consume() => QueueClient.Consume();
+    public async Task Consume(CancellationToken cancellationToken) => await QueueClient.Consume(cancellationToken);
+    public async Task<ICommandEnvelope> Consume() => await QueueClient.Consume();
     public void Recover() => QueueClient.Recover();
     public bool ClearPendingQueue() => QueueClient.ClearPendingQueue();
     public bool ClearInProgressQueue() => QueueClient.ClearInProgressQueue();