perf: less sql statements and concurrent start/stop

pull/5193/head
Peace 3 months ago
parent 6179f31348
commit f622898ff1
No known key found for this signature in database
GPG Key ID: 0EF6B46E172B739F

@ -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 * @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) { static async getAllChildrenIDs(monitorID) {
const childs = await Monitor.getChildren(monitorID); const children = await R.getAll(`
WITH RECURSIVE MonitorHierarchy(id) AS (
if (childs === null) { SELECT id FROM monitor WHERE id = ?
return []; UNION ALL
} SELECT m.id FROM monitor m INNER JOIN MonitorHierarchy mh ON m.parent = mh.id
)
let childrenIDs = []; SELECT id FROM MonitorHierarchy WHERE id != ?;
`, [
for (const child of childs) { monitorID,
childrenIDs.push(child.id); monitorID
childrenIDs = childrenIDs.concat(await Monitor.getAllChildrenIDs(child.id)); ]);
}
return childrenIDs; return children.map((child) => child.id);
} }
/** /**

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

Loading…
Cancel
Save