ric/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-11-23 14:54:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

perf: less sql statements and concurrent start/stop

Browse source
This commit is contained in:
Peace 2024-10-16 22:54:15 +02:00
parent 6179f31348
commit f622898ff1
No known key found for this signature in database
GPG key ID: 0EF6B46E172B739F
2 changed files with 33 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
server/model/monitor.js
View file

@ -1661,25 +1661,24 @@ class Monitor extends BeanModel {
}
/**
* Gets recursive all child ids
* Gets recursive all children ids
* @param {number} monitorID ID of the monitor to get
* @returns {Promise<Array>} IDs of all children
* @returns {Promise<number[]>} IDs of all children
*/
static async getAllChildrenIDs(monitorID) {
const childs = await Monitor.getChildren(monitorID);
const children = await R.getAll(`
WITH RECURSIVE MonitorHierarchy(id) AS (
SELECT id FROM monitor WHERE id = ?
UNION ALL
SELECT m.id FROM monitor m INNER JOIN MonitorHierarchy mh ON m.parent = mh.id
)
SELECT id FROM MonitorHierarchy WHERE id != ?;
`, [
monitorID,
monitorID
]);
if (childs === null) {
return [];
}
let childrenIDs = [];
for (const child of childs) {
childrenIDs.push(child.id);
childrenIDs = childrenIDs.concat(await Monitor.getAllChildrenIDs(child.id));
}
return childrenIDs;
return children.map((child) => child.id);
}
/**

94
server/server.js
View file

@ -1752,51 +1752,20 @@ async function startMonitor(userID, monitorID) {
userID,
]);
let monitor = await R.findOne("monitor", " id = ? ", [
monitorID,
]);
const childrenIDs = await Monitor.getAllChildrenIDs(monitorID);
console.log(childrenIDs);
const monitorIDs = [ monitorID, ...childrenIDs ];
if (monitor.id in server.monitorList) {
await server.monitorList[monitor.id].stop();
}
let monitors = await R.find("monitor", ` id IN (${monitorIDs.map((_) => "?").join(",")})`, monitorIDs);
server.monitorList[monitor.id] = monitor;
await monitor.start(io);
await Promise.all(monitors.map(async (monitor) => {
if (monitor.id in server.monitorList) {
await server.monitorList[monitor.id].stop();
}
const children = await Monitor.getChildren(monitorID);
for (let child of children) {
await startMonitorAsChild(userID, child.id);
}
}
/**
* Start the specified monitor as child
* @param {number} userID ID of user who owns monitor
* @param {number} monitorID ID of monitor to start
* @returns {Promise<void>}
*/
async function startMonitorAsChild(userID, monitorID) {
let monitor = await R.findOne("monitor", " id = ? ", [
monitorID,
]);
if (monitor.active !== 1) {
return;
}
log.info("manage", `Resume Monitor: ${monitorID} User ID: ${userID}`);
if (monitor.id in server.monitorList) {
await server.monitorList[monitor.id].stop();
}
server.monitorList[monitor.id] = monitor;
await monitor.start(io);
const children = await Monitor.getChildren(monitorID);
for (let child of children) {
await startMonitorAsChild(userID, child.id);
}
server.monitorList[monitor.id] = monitor;
await monitor.start(io);
}));
}
/**
@ -1825,41 +1794,16 @@ async function pauseMonitor(userID, monitorID) {
userID,
]);
if (monitorID in server.monitorList) {
await server.monitorList[monitorID].stop();
server.monitorList[monitorID].active = 0;
}
const childrenIDs = await Monitor.getAllChildrenIDs(monitorID);
const monitorIDs = [ monitorID, ...childrenIDs ];
const children = await Monitor.getChildren(monitorID);
for (let child of children) {
await pauseMonitorAsChild(userID, child.id);
}
}
await Promise.all(monitorIDs.map(async (currentMonitorID) => {
if (currentMonitorID in server.monitorList) {
await server.monitorList[currentMonitorID].stop();
}
}));
/**
* Pause a given monitor as child
* @param {number} userID ID of user who owns monitor
* @param {number} monitorID ID of monitor to start
* @returns {Promise<void>}
*/
async function pauseMonitorAsChild(userID, monitorID) {
let monitor = await R.findOne("monitor", " id = ? ", [
monitorID,
]);
if (monitor.active !== 1) {
return;
}
log.info("manage", `Pause Monitor: ${monitorID} User ID: ${userID}`);
if (monitorID in server.monitorList) {
await server.monitorList[monitorID].stop();
}
const children = await Monitor.getChildren(monitorID);
for (let child of children) {
await pauseMonitorAsChild(userID, child.id);
}
server.monitorList[monitorID].active = 0;
}
/**