Remove group worker when raise exceptions.

Author: Shkarlatov

GroupWorker.cs

@@ -20,20 +20,21 @@ public GroupWorker(BaseHTTPClient[] clients,IMEI.IMEIGenerator generator)
             this.clients = clients;
             this.IMEIGenerator = generator;
             GroupName = clients.First().GetType().Name;
+
+            _cache = clients.ToDictionary(
+                  x => x.GetHashCode()
+                  , x => x.GetQueryAsync(
+                       IMEIGenerator.GetValidIMEI(SkipIMEICount++)
+                       .First()
+                       ));
         }
 
         public async Task<string[]> GetTask()
         {
             if(_cache.Count==0)
             {
-                _cache = clients.ToDictionary(
-                    x=>x.GetHashCode()
-                    ,x=>x.GetQueryAsync(
-                        IMEIGenerator.GetValidIMEI(SkipIMEICount++)
-                        .First()
-                        ));
+                throw new Exception();
             }
-
             while(true)
             {
                 await Task.Delay(1);
@@ -48,8 +49,16 @@ public async Task<string[]> GetTask()
                     var result = await completedTask.Value;
                     lst.Add(result);
 
-                    _cache[completedTask.Key] = clients.First(x => x.GetHashCode() == completedTask.Key).GetQueryAsync(IMEIGenerator.GetValidIMEI(SkipIMEICount++)
-                        .First());
+                    try
+                    {
+                        _cache[completedTask.Key] = clients.First(x => x.GetHashCode() == completedTask.Key).GetQueryAsync(IMEIGenerator.GetValidIMEI(SkipIMEICount++)
+                       .First());
+                    }
+                    catch
+                    {
+                        _cache.Remove(completedTask.Key);
+                    }
+                   
                 }
                 if (lst.Count > 0)
                     return lst.ToArray();

Worker.cs

@@ -101,11 +101,20 @@ private async Task DoWork()
             while (true)
             {
                 await Task.WhenAny(dic.Values);
+
+                var errors = dic.Where(x => x.Value.IsFaulted).ToArray();
+                foreach(var error in errors)
+                {
+                    dic.Remove(error.Key);
+                }
+                
                 foreach(var task in dic.Where(x=>x.Value.IsCompleted).ToArray())
                 {
-                    dic[task.Key] = groupWorkers
-                        .First(x => x.GroupName == task.Key)
-                        .GetTask();
+
+                        dic[task.Key] = groupWorkers
+                       .First(x => x.GroupName == task.Key)
+                       .GetTask();
+
 
                     var result = await task.Value;
                     foreach(var res in result)