Code cleanup.

gatewayprogrammingschool · Sep 15, 2021 · 6ba9c53 · 6ba9c53
1 parent e8a4d9f
commit 6ba9c53
Showing 1 changed file with 23 additions and 6 deletions.
diff --git a/PersistentWorkQueue/WorkQueue.cs b/PersistentWorkQueue/WorkQueue.cs
@@ -10,8 +10,8 @@ namespace PersistentWorkQueue
 {
     public class WorkQueue<TRequest> : IDisposable
     {
-        private ConcurrentQueue<RequestWrapper<TRequest>> _requestQueue
-            = new ConcurrentQueue<RequestWrapper<TRequest>>();
+        private readonly ConcurrentQueue<RequestWrapper<TRequest>> _requestQueue
+            = new ();
 
         private Timer? _timer;
         private bool disposedValue;
@@ -107,7 +107,12 @@ public void StopTimer()
             _timer = null;
         }
 
-        public IEnumerable<RequestWrapper<TRequest>> Enqueue(IEnumerable<TRequest> requests, CancellationToken token = default)
+        public IEnumerable<RequestWrapper<TRequest>> Enqueue(IEnumerable<TRequest> requests)
+        {
+            return Enqueue(requests, default);
+        }
+
+        public IEnumerable<RequestWrapper<TRequest>> Enqueue(IEnumerable<TRequest> requests, CancellationToken? token)
         {
             List<RequestWrapper<TRequest>> newItems = new();
 
@@ -131,7 +136,12 @@ public IEnumerable<RequestWrapper<TRequest>> Enqueue(IEnumerable<TRequest> reque
             return newItems;
         }
 
-        public RequestWrapper<TRequest> Enqueue(TRequest request, CancellationToken token = default)
+        public RequestWrapper<TRequest> Enqueue(TRequest request)
+        {
+            return Enqueue(request, default);
+        }
+
+        public RequestWrapper<TRequest> Enqueue(TRequest request, CancellationToken? token)
         {
             RequestWrapper<TRequest> wrapper = new(request);
 
@@ -153,7 +163,7 @@ public bool DoWork()
             return DoWork(default);
         }
 
-        public bool DoWork(CancellationToken token)
+        public bool DoWork(CancellationToken? token)
         {
             var workList = _requestQueue.Where(w => !w.IsCanceled).ToList();
             try
@@ -162,7 +172,14 @@ public bool DoWork(CancellationToken token)
 
                 if (Options.FireAndForget)
                 {
-                    Task.Run(() => PerformActions(workList), token);
+                    if(token is CancellationToken tk)
+                    { 
+                        Task.Run((Action)(() => PerformActions(workList)), tk);
+                    }
+                    else
+                    {
+                        Task.Run((Action)(() => PerformActions(workList)));
+                    }
                 }
                 else
                 {