add retry to freenom clear challenge

AMEST · Feb 19, 2022 · 35f6ece · 35f6ece
1 parent dbc6b6d
commit 35f6ece
Showing 1 changed file with 16 additions and 11 deletions.
diff --git a/DotNetCertBot.FreenomDnsProvider/FreenomDnsProvider.cs b/DotNetCertBot.FreenomDnsProvider/FreenomDnsProvider.cs
@@ -53,20 +53,25 @@ public async Task AddChallenge(DnsChallenge challenge, string zoneName)
 
         public async Task ClearChallenge(string zoneName, string id)
         {
-            var zones = await Retry.Do(async () => await _client.GetZones(), RetryCount, RetryDelay);
-            var neededZone = zones.FirstOrDefault(z => z.Name.Equals(zoneName, StringComparison.OrdinalIgnoreCase));
-            if (neededZone == null)
-                throw new Exception($"Zone ({zoneName}) not found");
+            await Retry.Do(async () =>
+            {
+                var zones = await Retry.Do(async () => await _client.GetZones(), RetryCount, RetryDelay);
+                var neededZone = zones.FirstOrDefault(z => z.Name.Equals(zoneName, StringComparison.OrdinalIgnoreCase));
+                if (neededZone == null)
+                    throw new Exception($"Zone ({zoneName}) not found");
 
-            var records = await Retry.Do(async () => await _client.GetDnsRecords(neededZone), RetryCount, RetryDelay);
-            var neededRecord = records.FirstOrDefault(r =>
-                r.Name.Equals(NormalizeDnsName(id, zoneName), StringComparison.OrdinalIgnoreCase) &&
-                r.Type == DnsRecordType.TXT);
+                var records = await Retry.Do(async () => await _client.GetDnsRecords(neededZone), RetryCount,
+                    RetryDelay);
+                var neededRecord = records.FirstOrDefault(r =>
+                    r.Name.Equals(NormalizeDnsName(id, zoneName), StringComparison.OrdinalIgnoreCase) &&
+                    r.Type == DnsRecordType.TXT);
 
-            if (neededRecord == null)
-                throw new Exception($"Dns record ({id}) not found");
+                if (neededRecord == null)
+                    throw new Exception($"Dns record ({id}) not found");
 
-            await Retry.Do(async () => await _client.RemoveDnsRecord(neededZone, neededRecord), RetryCount, RetryDelay);
+                await Retry.Do(async () => await _client.RemoveDnsRecord(neededZone, neededRecord), RetryCount,
+                    RetryDelay);
+            }, RetryCount, RetryDelay);
         }
 
         public void Dispose()