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

feat: set childs under maintenance if parent is too

Browse Source
This commit is contained in:
Peace
2023-01-28 14:02:10 +01:00
parent aba515e172
commit f3ac351d75
3 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/model/monitor.js
View File

@@ -1322,7 +1322,17 @@ class Monitor extends BeanModel {
ON maintenance_timeslot.maintenance_id = maintenance.id
WHERE ${activeCondition}
LIMIT 1`, [ monitorID ]);
return maintenance.count !== 0;
if (maintenance.count !== 0) {
return true;
}
// Check if parent is under maintenance
const parent = await Monitor.getParent(monitorID);
if (parent === null) {
return false;
}
return await Monitor.isUnderMaintenance(parent.id);
}
/** Make sure monitor interval is between bounds */

2
server/socket-handlers/maintenance-socket-handler.js
View File

@@ -187,7 +187,7 @@ module.exports.maintenanceSocketHandler = (socket) => {
log.debug("maintenance", `Get Monitors for Maintenance: ${maintenanceID} User ID: ${socket.userID}`);
let monitors = await R.getAll("SELECT monitor.id, monitor.name FROM monitor_maintenance mm JOIN monitor ON mm.monitor_id = monitor.id WHERE mm.maintenance_id = ? ", [
let monitors = await R.getAll("SELECT monitor.id FROM monitor_maintenance mm JOIN monitor ON mm.monitor_id = monitor.id WHERE mm.maintenance_id = ? ", [
maintenanceID,
]);