From 32c9dfbb314837052ab93bcd6949cdd82d434022 Mon Sep 17 00:00:00 2001
From: Nelson Chan <chakflying@hotmail.com>
Date: Thu, 23 Sep 2021 23:21:08 +0800
Subject: [PATCH 1/2] Fix: clear important beats after deleteMonitor

---
 server/database.js | 1 +
 server/server.js   | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/server/database.js b/server/database.js
index 2f6c1c5..4cf1e39 100644
--- a/server/database.js
+++ b/server/database.js
@@ -107,6 +107,7 @@ class Database {
         R.freeze(true);
         await R.autoloadModels("./server/model");
 
+        await R.exec("PRAGMA foreign_keys = ON");
         // Change to WAL
         await R.exec("PRAGMA journal_mode = WAL");
         await R.exec("PRAGMA cache_size = -12000");
diff --git a/server/server.js b/server/server.js
index 5109536..5b5d6b2 100644
--- a/server/server.js
+++ b/server/server.js
@@ -637,6 +637,8 @@ exports.entryPage = "dashboard";
                 });
 
                 await sendMonitorList(socket);
+                // Clear heartbeat list on client
+                await sendImportantHeartbeatList(socket, monitorID, true, true);
 
             } catch (e) {
                 callback({

From 3e4154dfb57815b78b0f0baeb7713f5dbe887627 Mon Sep 17 00:00:00 2001
From: LouisLam <louislam@users.noreply.github.com>
Date: Wed, 29 Sep 2021 17:20:35 +0800
Subject: [PATCH 2/2] Fix retry interval affected bug

---
 server/model/monitor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/model/monitor.js b/server/model/monitor.js
index 9a80225..a50bacc 100644
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@@ -317,7 +317,7 @@ class Monitor extends BeanModel {
             if (bean.status === UP) {
                 console.info(`Monitor #${this.id} '${this.name}': Successful Response: ${bean.ping} ms | Interval: ${beatInterval} seconds | Type: ${this.type}`);
             } else if (bean.status === PENDING) {
-                if (this.retryInterval !== this.interval) {
+                if (this.retryInterval > 0) {
                     beatInterval = this.retryInterval;
                 }
                 console.warn(`Monitor #${this.id} '${this.name}': Pending: ${bean.msg} | Max retries: ${this.maxretries} | Retry: ${retries} | Retry Interval: ${beatInterval} seconds | Type: ${this.type}`);