From 7da9f139c1bd91c80dd880c8b97c0981576c0749 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Kr=C3=BDda?= <karel.kryda@gmail.com>
Date: Mon, 9 May 2022 21:10:12 +0200
Subject: [PATCH] Bug fix
---
server/model/monitor.js | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/server/model/monitor.js b/server/model/monitor.js
index f2d16524b..eaafb7755 100644
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@@ -182,7 +182,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,
]);
@@ -377,9 +377,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