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

Merge remote-tracking branch 'ghupstream/master' into radius-check

Browse Source
This commit is contained in:
Sascha Kruse
2022-05-18 15:54:10 +02:00
parent 398ecb7666 9fc5a3329f
commit 019d638767
22 changed files with 253 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/model/monitor.js
View File

@@ -187,7 +187,7 @@ class Monitor extends BeanModel {
// undefined if not https
let tlsInfo = undefined;
if (!previousBeat) {
if (!previousBeat || this.type === "push") {
previousBeat = await R.findOne("heartbeat", " monitor_id = ? ORDER BY time DESC", [
this.id,
]);
@@ -382,9 +382,6 @@ 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