Rework queue length command

Author: ethanhann

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

@@ -151,21 +151,6 @@ public void RepublishFailedMessages()
         public void Recover()
         {}
 
-        public long GetFailedQueueLength()
-        {
-            return new DirectoryInfo(FailedQueuePath).GetFiles().LongCount();
-        }
-
-        public long GetInProgressQueueLength()
-        {
-            return new DirectoryInfo(InProgressQueuePath).GetFiles().LongCount();
-        }
-
-        public long GetPendingQueueLength()
-        {
-            return new DirectoryInfo(PendingQueuePath).GetFiles().LongCount();
-        }
-
         public bool ClearFailedQueue()
         {
             return ClearQueue(FailedQueuePath);
@@ -221,5 +206,14 @@ public List<ICommandEnvelope> PeekMessages(string queuePath, long from, long to)
                 .Select(x => File.ReadAllText(x.FullName).DeserializeFromJson<CommandEnvelope>() as ICommandEnvelope)
                 .ToList();
         }
+
+        public Dictionary<string, long> GetQueueLengths()
+        {
+            return new Dictionary<string, long>() {
+                {"Pending", new DirectoryInfo(PendingQueuePath).GetFiles().LongCount()},
+                {"In-progress", new DirectoryInfo(InProgressQueuePath).GetFiles().LongCount()},
+                {"Failed", new DirectoryInfo(FailedQueuePath).GetFiles().LongCount()}
+            };
+        }
     }
 }

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

@@ -170,29 +170,12 @@ public bool ClearFailedQueue()
             return Channel.QueuePurge(FailedQueueName) > 0;
         }
 
-        public long GetPendingQueueLength()
-        {
-            InitChannel();
-            return Channel.MessageCount(PendingQueueName);
-        }
-
-        public long GetFailedQueueLength()
-        {
-            InitChannel();
-            return Channel.MessageCount(FailedQueueName);
-        }
-
         #region Not implemented
         public bool ClearInProgressQueue()
         {
             throw new NotImplementedException();
         }
 
-        public long GetInProgressQueueLength()
-        {
-            throw new NotImplementedException();
-        }
-
         public List<ICommandEnvelope> PeekFailedMessages(long from, long to)
         {
             throw new NotImplementedException();
@@ -220,5 +203,14 @@ public void Dispose()
             if (Connection != null && Connection.IsOpen)
                 Connection.Close();
         }
+
+        public Dictionary<string, long> GetQueueLengths()
+        {
+            InitChannel();
+            return new Dictionary<string, long>() {
+                {"Pending", Channel.MessageCount(PendingQueueName)},
+                {"Failed", Channel.MessageCount(FailedQueueName)}
+            };
+        }
     }
 }

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

@@ -34,7 +34,6 @@ public class RedisClient : IQueueClient
         public ConnectionMultiplexer _connectionMultiplexer;
         public IDatabase Redis { get { return Connection.GetDatabase(ClientSettings.Database); } }
         public bool UseCompression { get; set; }
-
         public RedisChannel RedisChannel { get; set; }
 
         public void InitChannel()
@@ -135,21 +134,6 @@ public ICommandEnvelope Consume()
             return commandEnvelope;
         }
 
-        public long GetPendingQueueLength()
-        {
-            return Redis.ListLength(PendingQueueName);
-        }
-
-        public long GetInProgressQueueLength()
-        {
-            return Redis.ListLength(InProgressQueueName);
-        }
-
-        public long GetFailedQueueLength()
-        {
-            return Redis.ListLength(FailedQueueName);
-        }
-
         public bool ClearPendingQueue()
         {
             return Redis.KeyDelete(PendingQueueName);
@@ -191,5 +175,14 @@ public List<ICommandEnvelope> GetMessages(string queueName, long from, long to)
                         .ToStringArray()
                         .Select(x => x.DeserializeFromJson<CommandEnvelope>() as ICommandEnvelope).ToList();
         }
+
+        public Dictionary<string, long> GetQueueLengths()
+        {
+            return new Dictionary<string, long> {
+                {"Pending", Redis.ListLength(PendingQueueName)},
+                {"In-progress", Redis.ListLength(InProgressQueueName)},
+                {"Failed", Redis.ListLength(FailedQueueName)}
+            };
+        }
     }
 }

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

@@ -47,21 +47,6 @@ public bool ClearPendingQueue()
             throw new NotImplementedException();
         }
 
-        public long GetFailedQueueLength()
-        {
-            throw new NotImplementedException();
-        }
-
-        public long GetInProgressQueueLength()
-        {
-            throw new NotImplementedException();
-        }
-
-        public long GetPendingQueueLength()
-        {
-            throw new NotImplementedException();
-        }
-
         public List<ICommandEnvelope> PeekFailedMessages(long from, long to)
         {
             throw new NotImplementedException();
@@ -81,5 +66,10 @@ public void RepublishFailedMessages()
         {
             throw new NotImplementedException();
         }
+
+        public Dictionary<string, long> GetQueueLengths()
+        {
+            return new Dictionary<string, long>();
+        }
     }
 }

src/InEngine.Core/Queuing/Commands/Length.cs

@@ -1,4 +1,4 @@
-using System;
+using System.Linq;
 
 namespace InEngine.Core.Queuing.Commands
 {
@@ -12,46 +12,12 @@ public override void Run()
 
         public void PrintQueueLengths(QueueAdapter queue)
         {
-            var textLeftPadding = 15;
-            var numberLeftPadding = 2;
             Warning($"{queue.QueueName} Queue:");
-
-            try
-            {
-                InfoText("".PadLeft(numberLeftPadding));
-                InfoText("Pending");
-                InfoText("".PadLeft(textLeftPadding));
-                Line(queue.GetPendingQueueLength().ToString());
-            }
-            catch (NotImplementedException)
-            {
-                Error("Not supported by queue client.");
-            }
-
-            try
-            {
-                InfoText("".PadLeft(numberLeftPadding));
-                InfoText("In-progress");
-                InfoText("".PadLeft(textLeftPadding));
-                Line(queue.GetInProgressQueueLength().ToString());
-            }
-            catch (NotImplementedException)
-            {
-                Error("Not supported by queue client.");
-            }
-
-            try
-            {
-                InfoText("".PadLeft(numberLeftPadding));
-                InfoText("Failed");
-                InfoText("".PadLeft(textLeftPadding));
-                Line(queue.GetFailedQueueLength().ToString());
-            }
-            catch (NotImplementedException)
-            {
-                Error("Not supported by queue client.");
-            }
+            queue.GetQueueLengths().ToList().ForEach(x => { 
+                InfoText(x.Key.PadLeft(15));
+                Line(x.Value.ToString().PadLeft(10));
+            });
             Newline();
         }
     }
-}
+}

src/InEngine.Core/Queuing/IQueueClient.cs

@@ -16,9 +16,7 @@ public interface IQueueClient
         void Consume(CancellationToken cancellationToken);
         ICommandEnvelope Consume();
         void Recover();
-        long GetPendingQueueLength();
-        long GetInProgressQueueLength();
-        long GetFailedQueueLength();
+        Dictionary<string, long> GetQueueLengths();
         bool ClearPendingQueue();
         bool ClearInProgressQueue();
         bool ClearFailedQueue();

src/InEngine.Core/Queuing/QueueAdapter.cs

@@ -73,21 +73,6 @@ public void Recover()
             QueueClient.Recover();
         }
 
-        public long GetPendingQueueLength()
-        {
-            return QueueClient.GetPendingQueueLength();
-        }
-
-        public long GetInProgressQueueLength()
-        {
-            return QueueClient.GetInProgressQueueLength();
-        }
-
-        public long GetFailedQueueLength()
-        {
-            return QueueClient.GetFailedQueueLength();
-        }
-
         public bool ClearPendingQueue()
         {
             return QueueClient.ClearPendingQueue();
@@ -122,5 +107,10 @@ public List<ICommandEnvelope> PeekFailedMessages(long from, long to)
         {
             return QueueClient.PeekFailedMessages(from, to);
         }
+
+        public Dictionary<string, long> GetQueueLengths()
+        {
+            return QueueClient.GetQueueLengths();
+        }
     }
 }