7x31/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-09-18 01:16:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 2.0-last-part

Browse Source 
# Conflicts:
#	server/database.js
#	server/jobs/clear-old-data.js
This commit is contained in:
Louis Lam
2024-10-09 07:46:12 +08:00
parent 9ff9a9edcc eca90a2b00
commit ed5963deb7
27 changed files with 203 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/jobs/clear-old-data.js
View File

@@ -1,7 +1,7 @@
const { R } = require("redbean-node");
const { log } = require("../../src/util");
const { setSetting, setting } = require("../util-server");
const Database = require("../database");
const { Settings } = require("../settings");
const DEFAULT_KEEP_PERIOD = 180;
@@ -25,7 +25,7 @@ const clearOldData = async () => {
* - keep according to the setting (keepDataPeriodDays) (default 180 days)
*/
let period = await Settings.get("keepDataPeriodDays");
let period = await setting("keepDataPeriodDays");
// Set Default Period
if (period == null) {
@@ -39,7 +39,7 @@ const clearOldData = async () => {
parsedPeriod = parseInt(period);
} catch (_) {
log.warn("clearOldData", "Failed to parse setting, resetting to default..");
await Settings.set("keepDataPeriodDays", DEFAULT_KEEP_PERIOD, "general");
await setSetting("keepDataPeriodDays", DEFAULT_KEEP_PERIOD, "general");
parsedPeriod = DEFAULT_KEEP_PERIOD;
}