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

Fix #922

Browse source
This commit is contained in:
Louis Lam 2021-12-08 14:59:59 +08:00
parent 76611ecaca
commit dcc91d6c72
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
server/model/monitor.js
View file

@ -296,6 +296,9 @@ class Monitor extends BeanModel {
debug("heartbeatCount" + heartbeatCount + " " + time); debug("heartbeatCount" + heartbeatCount + " " + time);
if (heartbeatCount <= 0) { if (heartbeatCount <= 0) {
// Fix #922, since previous heartbeat could be inserted by api, it should get from database
previousBeat = await Monitor.getPreviousHeartbeat(this.id);
throw new Error("No heartbeat in the time window"); throw new Error("No heartbeat in the time window");
} else { } else {
// No need to insert successful heartbeat for push type, so end here // No need to insert successful heartbeat for push type, so end here
@ -751,6 +754,15 @@ class Monitor extends BeanModel {
debug("No notification, no need to send cert notification"); debug("No notification, no need to send cert notification");
} }
} }
static async getPreviousHeartbeat(monitorID) {
return await R.getRow(`
SELECT status, time FROM heartbeat
WHERE id = (select MAX(id) from heartbeat where monitor_id = ?)
`, [
monitorID
]);
}
} }
module.exports = Monitor; module.exports = Monitor;

12
server/routers/api-router.js
View file

@ -31,12 +31,7 @@ router.get("/api/push/:pushToken", async (request, response) => {
throw new Error("Monitor not found or not active."); throw new Error("Monitor not found or not active.");
} }
const previousHeartbeat = await R.getRow(` const previousHeartbeat = await Monitor.getPreviousHeartbeat(monitor.id);
SELECT status, time FROM heartbeat
WHERE id = (select MAX(id) from heartbeat where monitor_id = ?)
`, [
monitor.id
]);
let status = UP; let status = UP;
if (monitor.isUpsideDown()) { if (monitor.isUpsideDown()) {
@ -157,8 +152,9 @@ router.get("/api/status-page/monitor-list", cache("5 minutes"), async (_request,
JOIN tag JOIN tag
ON monitor_tag.tag_id = tag.id ON monitor_tag.tag_id = tag.id
WHERE monitor_tag.monitor_id = ?`, [monitor.id] WHERE monitor_tag.monitor_id = ?`, [monitor.id]
); );
return {...monitor, tags: tags} return { ...monitor,
tags: tags };
})); }));
} }