mudhorn/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-11-13 17:14:21 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix first beat's uptime is 0%

Browse source
This commit is contained in:
LouisLam 2021-07-11 20:07:03 +08:00
parent eeb904b1ea
commit d357dcb334
2 changed files with 32 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -7,7 +7,7 @@
"update": "", "update": "",
"build": "vite build", "build": "vite build",
"vite-preview-dist": "vite preview --host", "vite-preview-dist": "vite preview --host",
"build-docker": "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma . --push", "build-docker": "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma -t louislam/uptime-kuma:1 . --push",
"setup": "git checkout 1.0.0 && npm install && npm run build" "setup": "git checkout 1.0.0 && npm install && npm run build"
}, },
"dependencies": { "dependencies": {

49
server/model/monitor.js
View file

@ -185,7 +185,7 @@ class Monitor extends BeanModel {
static async sendUptime(duration, io, monitorID, userID) { static async sendUptime(duration, io, monitorID, userID) {
let sec = duration * 3600; let sec = duration * 3600;
let downtimeList = await R.getAll(` let heartbeatList = await R.getAll(`
SELECT duration, time, status SELECT duration, time, status
FROM heartbeat FROM heartbeat
WHERE time > DATETIME('now', ? || ' hours') WHERE time > DATETIME('now', ? || ' hours')
@ -198,32 +198,45 @@ class Monitor extends BeanModel {
let total = 0; let total = 0;
let uptime; let uptime;
for (let row of downtimeList) { // Special handle for the first heartbeat only
let value = parseInt(row.duration) if (heartbeatList.length === 1) {
let time = row.time
// Handle if heartbeat duration longer than the target duration if (heartbeatList[0].status === 1) {
// e.g. Heartbeat duration = 28hrs, but target duration = 24hrs uptime = 1;
if (value > sec) { } else {
let trim = dayjs.utc().diff(dayjs(time), 'second'); uptime = 0;
value = sec - trim; }
if (value < 0) { } else {
value = 0; for (let row of heartbeatList) {
let value = parseInt(row.duration)
let time = row.time
// Handle if heartbeat duration longer than the target duration
// e.g. Heartbeat duration = 28hrs, but target duration = 24hrs
if (value > sec) {
let trim = dayjs.utc().diff(dayjs(time), 'second');
value = sec - trim;
if (value < 0) {
value = 0;
}
}
total += value;
if (row.status === 0) {
downtime += value;
} }
} }
total += value; uptime = (total - downtime) / total;
if (row.status === 0) {
downtime += value; if (uptime < 0) {
uptime = 0;
} }
} }
uptime = (total - downtime) / total;
if (uptime < 0) {
uptime = 0;
}
io.to(userID).emit("uptime", monitorID, duration, uptime); io.to(userID).emit("uptime", monitorID, duration, uptime);
} }