Merge branch 'hotfix/2.0.3'

KarmaKamikaze · Sep 24, 2024 · c163f2e · c163f2e
2 parents 58ea178 + 2f11df5
commit c163f2e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/MoxfieldPriceScraper/Dockerfile b/MoxfieldPriceScraper/Dockerfile
@@ -33,9 +33,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
-# Create the tasks.status file
-RUN touch /app/tasks.status
-
 COPY --from=build-env /app/out .
 
 HEALTHCHECK --interval=5m --timeout=1m --start-period=30s --retries=3 CMD ["dotnet", "MoxfieldPriceScraper.dll", "healthcheck"]

diff --git a/MoxfieldPriceScraper/Healthcheck/Healthcheck.cs b/MoxfieldPriceScraper/Healthcheck/Healthcheck.cs
@@ -4,20 +4,24 @@ namespace MoxfieldPriceScraper.Healthcheck;
 
 public static class Healthcheck
 {
-    private const string StatusFilePath = "tasks.status";
+    private const string StatusFile = "tasks.status";
     private static readonly object FileLock = new object();
 
     /// <summary>
     /// Initializes the status file with an empty dictionary if it doesn't exist.
     /// </summary>
     public static void InitializeStatusFile()
     {
+        var dataDirectory = Path.Combine(Directory.GetCurrentDirectory(), "Data");
+        Directory.CreateDirectory(dataDirectory);
+        var statusFilePath = Path.Combine(dataDirectory, StatusFile);
+
         lock (FileLock)
         {
-            if (!File.Exists(StatusFilePath))
+            if (!File.Exists(statusFilePath))
             {
                 var initialStatus = new TaskStatus();
-                File.WriteAllText(StatusFilePath, JsonConvert.SerializeObject(initialStatus, Formatting.Indented));
+                File.WriteAllText(statusFilePath, JsonConvert.SerializeObject(initialStatus, Formatting.Indented));
             }
         }
     }
@@ -29,13 +33,16 @@ public static void InitializeStatusFile()
     /// <param name="status">The new status.</param>
     public static void UpdateTaskStatus(string taskName, string status)
     {
+        var dataDirectory = Path.Combine(Directory.GetCurrentDirectory(), "Data");
+        var statusFilePath = Path.Combine(dataDirectory, StatusFile);
+
         lock (FileLock)
         {
-            var taskStatus = JsonConvert.DeserializeObject<TaskStatus>(File.ReadAllText(StatusFilePath));
+            var taskStatus = JsonConvert.DeserializeObject<TaskStatus>(File.ReadAllText(statusFilePath));
             if (taskStatus != null)
             {
                 taskStatus.Statuses[taskName] = status;
-                File.WriteAllText(StatusFilePath, JsonConvert.SerializeObject(taskStatus, Formatting.Indented));
+                File.WriteAllText(statusFilePath, JsonConvert.SerializeObject(taskStatus, Formatting.Indented));
             }
         }
     }
@@ -46,14 +53,17 @@ public static void UpdateTaskStatus(string taskName, string status)
     /// <returns>True if tasks are still running, false otherwise.</returns>
     public static bool AreTasksRunning()
     {
+        var dataDirectory = Path.Combine(Directory.GetCurrentDirectory(), "Data");
+        var statusFilePath = Path.Combine(dataDirectory, StatusFile);
+
         lock (FileLock)
         {
-            if (!File.Exists(StatusFilePath))
+            if (!File.Exists(statusFilePath))
             {
                 return false;
             }
 
-            var taskStatus = JsonConvert.DeserializeObject<TaskStatus>(File.ReadAllText(StatusFilePath));
+            var taskStatus = JsonConvert.DeserializeObject<TaskStatus>(File.ReadAllText(statusFilePath));
             return taskStatus != null && taskStatus.Statuses.ContainsValue("running");
         }
     }

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -18,7 +18,6 @@
     volumes:
       - ${PWD}/Data:/app/Data
       - ${PWD}/Logs:/app/Logs
-      - ${PWD}/tasks.status:/app/tasks.status
     labels:
       - "com.centurylinklabs.watchtower.enable=true"