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

Merge branch 'louislam:master' into logging

Browse Source
This commit is contained in:
Andreas Brett
2021-12-10 17:21:55 +01:00
committed by GitHub
parent e684712a77 0d69b4426e
commit 38f8a8ac2f
8 changed files with 100 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/model/monitor.js
View File

@@ -297,6 +297,9 @@ class Monitor extends BeanModel {
log_debug("monitor", "heartbeatCount" + heartbeatCount + " " + time);
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");
} else {
// No need to insert successful heartbeat for push type, so end here
@@ -752,6 +755,15 @@ class Monitor extends BeanModel {
log_debug("monitor", "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;