Infra-Mirrors/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-08-02 03:26:31 -04:00
Code Issues Projects Releases Packages 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
commit 38f8a8ac2f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 100 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

14
server/routers/api-router.js
View file

@ -31,12 +31,7 @@ router.get("/api/push/:pushToken", async (request, response) => {
throw new Error("Monitor not found or not active.");
}
const previousHeartbeat = await R.getRow(`
SELECT status, time FROM heartbeat
WHERE id = (select MAX(id) from heartbeat where monitor_id = ?)
`, [
monitor.id
]);
const previousHeartbeat = await Monitor.getPreviousHeartbeat(monitor.id);
let status = UP;
if (monitor.isUpsideDown()) {
@ -157,8 +152,11 @@ router.get("/api/status-page/monitor-list", cache("5 minutes"), async (_request,
JOIN tag
ON monitor_tag.tag_id = tag.id
WHERE monitor_tag.monitor_id = ?`, [monitor.id]
);
return {...monitor, tags: tags}
);
return {
...monitor,
tags: tags
};
}));
}