Revize fa084fc4

re #9443 ApiClient refactoring for better testing

ld_client/LDClient/Program.cs

@@ +1 @@
+using DiskQueue;
 using LDClient.detection;
 using LDClient.network;
 using LDClient.utils;
@@ -38 +39 @@
             Config.ApiUsbEndPoint, 
             Config.RetryPeriod, Config.MaxEntries,
             Config.MaxRetries, 
-            Config.CacheFileName
+            new PersistentQueue(Config.CacheFileName)
         );
         
         IProcessDetection processProcessDetection = new ProcessDetection(

ld_client/LDClient/network/ApiClient.cs

@@ -11 +11 @@
     public sealed class ApiClient : IApiClient {
         
         public IHttpClient _client;
-        public IPersistentQueue _cache;
-        
+
+        public bool ClientRunning;
+
         private readonly uint _retryPeriod;
         private readonly uint _maxEntries;
         private readonly uint _maxRetries;
-        
-        public ApiClient(string url, uint port, string path, uint retryPeriod, uint maxEntries, uint maxRetries, string cacheFilename) {
+        private readonly IPersistentQueue _cache;
+
+        public ApiClient(string url, uint port, string path, uint retryPeriod, uint maxEntries, uint maxRetries, IPersistentQueue cache) {
             var uri = $"{url}:{port}{path}";
             _retryPeriod = retryPeriod;
             _maxEntries = maxEntries;
             _maxRetries = maxRetries;
 
             _client = new HttpClient(uri);
-            _cache = new PersistentQueue(cacheFilename);
+            _cache = cache;
         }
 
         public async Task SendPayloadAsync(Payload payload) {
@@ -59 +61 @@
         private async Task ResendPayloadsAsync() {
             var numberOfPayloadsToResend = Math.Min(_maxRetries, _cache.EstimatedCountOfItemsInQueue);
             var payloads = new List<Payload>();
-
-            using (var session = _cache.OpenSession()) {
+            if (numberOfPayloadsToResend > 0) {
+                using var session = _cache.OpenSession();
                 for (var i = 0; i < numberOfPayloadsToResend; i++) {
                     var rawBytes = session.Dequeue();
                     var payload = JsonSerializer.Deserialize<Payload>(rawBytes);
@@ -96 +98 @@
 
         public async void Run() {
             Program.DefaultLogger.Info("Api Client thread has started");
-            while (true) {
+            ClientRunning = true;
+            while (ClientRunning) {
                 await ResendPayloadsAsync();
                 Thread.Sleep((int) _retryPeriod);
             }
-            // ReSharper disable once FunctionNeverReturns
         }
     }
 }