Infra-Mirrors/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-07-25 15:55:40 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into 2.0.X

Browse source 
# Conflicts:
#	package-lock.json
This commit is contained in:
Louis Lam 2023-08-30 01:39:16 +08:00
commit a13fc7079e
31 changed files with 403 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

13
server/server.js
View file

@ -1153,9 +1153,6 @@ let needSetup = false;
value,
]);
// Cleanup unused Tags
await R.exec("delete from tag where ( select count(*) from monitor_tag mt where tag.id = mt.tag_id ) = 0");
callback({
ok: true,
msg: "Deleted Successfully.",
@ -1234,6 +1231,7 @@ let needSetup = false;
}
const previousChromeExecutable = await Settings.get("chromeExecutable");
const previousNSCDStatus = await Settings.get("nscd");
await setSettings("general", data);
server.entryPage = data.entryPage;
@ -1251,6 +1249,15 @@ let needSetup = false;
await resetChrome();
}
// Update nscd status
if (previousNSCDStatus !== data.nscd) {
if (data.nscd) {
server.startNSCDServices();
} else {
server.stopNSCDServices();
}
}
callback({
ok: true,
msg: "Saved"