TyleoDvDelaware3217/Kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-06-15 17:06:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

update duration cal

Browse source
This commit is contained in:
thoverik 2022-03-23 13:20:03 +07:00
parent 638f2f05ca
commit 7e50bb3640
4 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -13,3 +13,4 @@ dist-ssr
/out
/tmp
.env
kuma/

5
package-lock.json generated
View file

@ -8359,6 +8359,11 @@
"resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
"integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
},
"moment-duration-format": {
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/moment-duration-format/-/moment-duration-format-2.3.2.tgz",
"integrity": "sha512-cBMXjSW+fjOb4tyaVHuaVE/A5TqkukDWiOfxxAjY+PEqmmBQlLwn+8OzwPiG3brouXKY5Un4pBjAeB6UToXHaQ=="
},
"ms": {
"version": "2.1.3",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",

1
package.json
View file

@ -84,6 +84,7 @@
"jwt-decode": "^3.1.2",
"limiter": "^2.1.0",
"moment": "^2.29.1",
"moment-duration-format": "^2.3.2",
"nodemailer": "~6.6.5",
"notp": "~2.0.3",
"password-hash": "~1.2.2",

27
server/model/monitor.js
View file

@ -15,7 +15,8 @@ const { demoMode } = require('../config')
const version = require('../../package.json').version
const apicache = require('../modules/apicache')
const moment = require('moment')
const momentDurationFormatSetup = require('moment-duration-format')
momentDurationFormatSetup(moment)
/**
* status:
* 0 = DOWN
@ -386,7 +387,7 @@ class Monitor extends BeanModel {
}
}
debug(`[${this.name}] Check isImportant`)
debug(`[${this.name}] Check isImportant`, { isFirstBeat, previousBeat: previousBeat?.status, currentStatus: bean.status })
const isImportant = Monitor.isImportantBeat(isFirstBeat, previousBeat?.status, bean.status)
// Mark as important if status changed, ignore pending pings,
@ -654,9 +655,9 @@ class Monitor extends BeanModel {
// DOWN -> DOWN = not important
// * DOWN -> UP = important
const isImportant = isFirstBeat ||
(previousBeatStatus === UP && currentBeatStatus === DOWN) ||
(previousBeatStatus === DOWN && currentBeatStatus === UP) ||
(previousBeatStatus === PENDING && currentBeatStatus === DOWN)
(previousBeatStatus === UP && currentBeatStatus === DOWN) ||
(previousBeatStatus === DOWN && currentBeatStatus === UP) ||
(previousBeatStatus === PENDING && currentBeatStatus === DOWN)
return isImportant
}
@ -668,11 +669,15 @@ class Monitor extends BeanModel {
let message
if (bean.status === UP) {
text = '✅ Up'
const heartbeat = await Monitor.getPreviousHeartbeatByStatus(monitor, DOWN)
message = `${text}: ${monitor.name} ( ${monitor.url} ).`
const heartbeat = await Monitor.getPreviousHeartbeatByStatus(monitor.id, DOWN)
if (heartbeat) {
const diff = moment(bean.time).diff(moment(heartbeat.time))
const duration = moment.utc(diff).format('HH:mm:ss.SSS')
// const duration = moment.utc(diff).format('HH:mm:ss.SSS')
console.log({ diff, beanTime: bean.time, heartbeatTime: heartbeat.time })
const duration = moment.duration(diff, 'milliseconds').format('w [weeks], d [days], h [hours], m [minutes], s [seconds]', {
trim: 'both mid'
})
message += ` It was down for ${duration}.`
}
} else {
@ -765,10 +770,12 @@ class Monitor extends BeanModel {
static async getPreviousHeartbeatByStatus (monitorID, status = 0) {
return await R.getRow(`
SELECT status, time FROM heartbeat
WHERE id = (select MAX(id) from heartbeat where monitor_id = ? and status = ?)
SELECT status, time FROM heartbeat
WHERE id = (
SELECT MIN(id) FROM heartbeat WHERE monitor_id = ? and status = ? and id > (
SELECT MAX(id) FROM heartbeat WHERE monitor_id = ? and status = ?))
`, [
monitorID, status
monitorID, status, monitorID, status ? 0 : 1
])
}
}