Fix: Use croner for clear-old-data

server/jobs.js

@@ -1,41 +1,44 @@
-const path = require("path");
-const Bree = require("bree");
-const { SHARE_ENV } = require("worker_threads");
-const { log } = require("../src/util");
-let bree;
+const { UptimeKumaServer } = require("./uptime-kuma-server");
+const { clearOldData } = require("./jobs/clear-old-data");
+const Cron = require("croner");
+
 const jobs = [
     {
         name: "clear-old-data",
-        interval: "at 03:14",
+        interval: "14 03 * * *",
+        jobFunc: clearOldData,
+        croner: null,
     },
 ];
 
 /**
  * Initialize background jobs
- * @param {Object} args Arguments to pass to workers
- * @returns {Bree}
+ * @returns {Promise<void>}
  */
-const initBackgroundJobs = function (args) {
-    bree = new Bree({
-        root: path.resolve("server", "jobs"),
-        jobs,
-        worker: {
-            env: SHARE_ENV,
-            workerData: args,
-        },
-        workerMessageHandler: (message) => {
-            log.info("jobs", message);
-        }
-    });
+const initBackgroundJobs = async function () {
+    const timezone = await UptimeKumaServer.getInstance().getTimezone();
+
+    for (const job of jobs) {
+        const cornerJob = new Cron(
+            job.interval,
+            {
+                name: job.name,
+                timezone,
+            },
+            job.jobFunc,
+        );
+        job.croner = cornerJob;
+    }
 
-    bree.start();
-    return bree;
 };
 
 /** Stop all background jobs if running */
 const stopBackgroundJobs = function () {
-    if (bree) {
-        bree.stop();
+    for (const job of jobs) {
+        if (job.croner) {
+            job.croner.stop();
+            job.croner = null;
+        }
     }
 };
 

server/jobs/clear-old-data.js

@@ -1,12 +1,15 @@
-const { log, exit, connectDb } = require("./util-worker");
 const { R } = require("redbean-node");
+const { log } = require("../../src/util");
 const { setSetting, setting } = require("../util-server");
 
 const DEFAULT_KEEP_PERIOD = 180;
 
-(async () => {
-    await connectDb();
+/**
+ * Clears old data from the heartbeat table of the database.
+ * @return {Promise<void>} A promise that resolves when the data has been cleared.
+ */
 
+const clearOldData = async () => {
     let period = await setting("keepDataPeriodDays");
 
     // Set Default Period
@@ -20,16 +23,16 @@ const DEFAULT_KEEP_PERIOD = 180;
     try {
         parsedPeriod = parseInt(period);
     } catch (_) {
-        log("Failed to parse setting, resetting to default..");
+        log.warn("clearOldData", "Failed to parse setting, resetting to default..");
         await setSetting("keepDataPeriodDays", DEFAULT_KEEP_PERIOD, "general");
         parsedPeriod = DEFAULT_KEEP_PERIOD;
     }
 
     if (parsedPeriod < 1) {
-        log(`Data deletion has been disabled as period is less than 1. Period is ${parsedPeriod} days.`);
+        log.info("clearOldData", `Data deletion has been disabled as period is less than 1. Period is ${parsedPeriod} days.`);
     } else {
 
-        log(`Clearing Data older than ${parsedPeriod} days...`);
+        log.debug("clearOldData", `Clearing Data older than ${parsedPeriod} days...`);
 
         try {
             await R.exec(
@@ -37,9 +40,11 @@ const DEFAULT_KEEP_PERIOD = 180;
                 [ parsedPeriod ]
             );
         } catch (e) {
-            log(`Failed to clear old data: ${e.message}`);
+            log.error("clearOldData", `Failed to clear old data: ${e.message}`);
         }
     }
+};
 
-    exit();
-})();
+module.exports = {
+    clearOldData,
+};

server/server.js

@@ -1557,7 +1557,7 @@ let needSetup = false;
         }
     });
 
-    initBackgroundJobs(args);
+    await initBackgroundJobs();
 
     // Start cloudflared at the end if configured
     await cloudflaredAutoStart(cloudflaredToken);