From c4326736aa4844a96df8eda275e03f127b027dec Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Tue, 20 May 2025 16:57:54 +0800 Subject: [PATCH] Fix: wrong status passed to isImportantForNotification() --- server/routers/api-router.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/routers/api-router.js b/server/routers/api-router.js index 3568f2abf..b00dbc02d 100644 --- a/server/routers/api-router.js +++ b/server/routers/api-router.js @@ -50,7 +50,7 @@ router.all("/api/push/:pushToken", async (request, response) => { let msg = request.query.msg || "OK"; let ping = parseFloat(request.query.ping) || null; let statusString = request.query.status || "up"; - let status = (statusString === "up") ? UP : DOWN; + const statusFromParam = (statusString === "up") ? UP : DOWN; let monitor = await R.findOne("monitor", " push_token = ? AND active = 1 ", [ pushToken @@ -80,7 +80,7 @@ router.all("/api/push/:pushToken", async (request, response) => { msg = "Monitor under maintenance"; bean.status = MAINTENANCE; } else { - determineStatus(status, previousHeartbeat, monitor.maxretries, monitor.isUpsideDown(), bean); + determineStatus(statusFromParam, previousHeartbeat, monitor.maxretries, monitor.isUpsideDown(), bean); } // Calculate uptime @@ -92,9 +92,9 @@ router.all("/api/push/:pushToken", async (request, response) => { log.debug("router", "PreviousStatus: " + previousHeartbeat?.status); log.debug("router", "Current Status: " + bean.status); - bean.important = Monitor.isImportantBeat(isFirstBeat, previousHeartbeat?.status, status); + bean.important = Monitor.isImportantBeat(isFirstBeat, previousHeartbeat?.status, bean.status); - if (Monitor.isImportantForNotification(isFirstBeat, previousHeartbeat?.status, status)) { + if (Monitor.isImportantForNotification(isFirstBeat, previousHeartbeat?.status, bean.status)) { // Reset down count bean.downCount = 0;