tweak run info

drittich · Nov 21, 2022 · 36aa6bc · 36aa6bc
1 parent bd0ff8d
commit 36aa6bc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/DnsTube.Service/ClientApp/src/controllers/main.ts b/DnsTube.Service/ClientApp/src/controllers/main.ts
@@ -20,7 +20,6 @@ function init() {
 
 	// get old log right away
 	getLog();
-	getRunInfo();
 
 	getSettingsAsync().then(async Settings => {
 		_settings = Settings;
@@ -34,6 +33,7 @@ function init() {
 			// refresh log to show DNS entry fetch status
 			getLog();
 			setupSse();
+			getRunInfo();
 		});
 
 	getPublicIp();
@@ -227,7 +227,7 @@ function setupSse() {
 }
 async function getRunInfo() {
 	let runInfo = await getRunInfoAsync();
-	(document.getElementById("last-update")! as HTMLInputElement).value = format(parseJSON(runInfo!.lastRun), "yyyy-MM-dd HH:mm:ss");
-	(document.getElementById("next-update")! as HTMLInputElement).value = format(parseJSON(runInfo!.nextRun), "yyyy-MM-dd HH:mm:ss");
+	(document.getElementById("last-update")! as HTMLInputElement).value = format(parseISO(runInfo!.lastRun), "yyyy-MM-dd HH:mm:ss");
+	(document.getElementById("next-update")! as HTMLInputElement).value = format(parseISO(runInfo!.nextRun), "yyyy-MM-dd HH:mm:ss");
 }
 
diff --git a/DnsTube.Service/Controllers/Api/SettingsController.cs b/DnsTube.Service/Controllers/Api/SettingsController.cs
@@ -61,7 +61,9 @@ public record RunInfo(string LastRun, string NextRun);
 		[Route("runinfo")]
 		public RunInfo GetRunInfo()
 		{
-			return new RunInfo(WorkerService.LastRun.ToString("yyyy-MM-ddTHH:mm:ss"), WorkerService.NextRun.ToString("yyyy-MM-ddTHH:mm:ss"));
+			if (WorkerService.LastRun == DateTimeOffset.MinValue)
+				throw new Exception("not ready");
+			return new RunInfo(WorkerService.LastRun.ToString("yyyy-MM-ddTHH:mm:sszzz"), WorkerService.NextRun.ToString("yyyy-MM-ddTHH:mm:sszzz"));
 		}
 	}
 }
diff --git a/DnsTube.Service/Worker.cs b/DnsTube.Service/Worker.cs
@@ -21,8 +21,8 @@ public class WorkerService : BackgroundService
 		private IConfiguration _configuration;
 		private IServerSentEventsService _serverSentEventsService;
 
-		public static DateTime LastRun;
-		public static DateTime NextRun;
+		public static DateTimeOffset LastRun;
+		public static DateTimeOffset NextRun;
 
 		public WorkerService(ILogger<WorkerService> logger, ISettingsService settingsService, IGitHubService githubService, ICloudflareService cloudflareService, ILogService logService, IIpAddressService ipAddressService, IConfiguration configuration, IServerSentEventsService serverSentEventsService)
 		{