track whether last updated succeeded

drittich · Aug 16, 2024 · 4d128de · 4d128de
1 parent 51161a7
commit 4d128de
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/DnsTube.Service/Worker.cs b/DnsTube.Service/Worker.cs
@@ -21,6 +21,7 @@ public class WorkerService : BackgroundService
 		private readonly IConfiguration _configuration;
 		private readonly IServerSentEventsService _serverSentEventsService;
 		private static bool isManualUpdate = false;
+		private static bool lastUpdateSuccessful = false;
 
 		public static DateTimeOffset LastRun;
 		public static DateTimeOffset NextRun;
@@ -116,14 +117,14 @@ await _serverSentEventsService.SendEventAsync(new ServerSentEvent
 				}
 				else
 				{
-					if (ipAddressChanged || isManualUpdate)
+					if (ipAddressChanged || isManualUpdate || !lastUpdateSuccessful)
 					{
 						if (isManualUpdate)
 							isManualUpdate = false;
 
 						var selectedDomainsValid = await _cloudflareService.ValidateSelectedDomainsAsync();
 						if (selectedDomainsValid)
-							await DoUpdateAsync(currentPublicIpv4Address, currentPublicIpv6Address);
+							lastUpdateSuccessful = await DoUpdateAsync(currentPublicIpv4Address, currentPublicIpv6Address);
 
 						await _serverSentEventsService.SendEventAsync(new ServerSentEvent
 						{
@@ -183,17 +184,20 @@ private async Task<string> GetIpAddressAsync(IpSupport ipSupport, string? previo
 			return currentPublicAddress;
 		}
 
-		private async Task DoUpdateAsync(string? publicIpv4Address, string? publicIpv6Address)
+		private async Task<bool> DoUpdateAsync(string? publicIpv4Address, string? publicIpv6Address)
 		{
 			var settings = await _settingsService.GetAsync();
+			var updateSuccessful = false;
 
 			// if IPv6-only support was not specified, do the IPv4 update
 			if (settings.ProtocolSupport != IpSupport.IPv6)
-				await _cloudflareService.UpdateDnsRecordsAsync(IpSupport.IPv4, publicIpv4Address);
+				updateSuccessful = await _cloudflareService.UpdateDnsRecordsAsync(IpSupport.IPv4, publicIpv4Address);
 
 			// if IPv4-only support was not specified, do the IPv6 update
 			if (settings.ProtocolSupport != IpSupport.IPv4)
-				await _cloudflareService.UpdateDnsRecordsAsync(IpSupport.IPv6, publicIpv6Address);
+				updateSuccessful = await _cloudflareService.UpdateDnsRecordsAsync(IpSupport.IPv6, publicIpv6Address);
+
+			return updateSuccessful;
 		}
 
 		public static async Task RequestManualUpdateAsync(ILogService logService)