7x31/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-08-09 03:09:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into something

Browse Source 
# Conflicts:
#	server/notification.js
#	src/components/NotificationDialog.vue
This commit is contained in:
LouisLam
2021-07-22 11:12:52 +08:00
parent 7c94c3b502 a64ce81457
commit 916b9da0dc
19 changed files with 703 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/model/monitor.js
View File

@@ -48,8 +48,6 @@ class Monitor extends BeanModel {
let previousBeat = null;
const beat = async () => {
console.log(`Monitor ${this.id}: Heartbeat`)
if (! previousBeat) {
previousBeat = await R.findOne("heartbeat", " monitor_id = ? ORDER BY time DESC", [
this.id
@@ -145,6 +143,12 @@ class Monitor extends BeanModel {
bean.important = false;
}
if (bean.status === 1) {
console.info(`Monitor #${this.id} '${this.name}': Successful Response: ${bean.ping} ms | Interval: ${this.interval} seconds | Type: ${this.type}`)
} else {
console.warn(`Monitor #${this.id} '${this.name}': Failing: ${bean.msg} | Type: ${this.type}`)
}
io.to(this.user_id).emit("heartbeat", bean.toJSON());
await R.store(bean)