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

Merge branch 'master' into feature/add_prometheus_metrics

Browse Source 
# Conflicts:
#	server/model/monitor.js
This commit is contained in:
LouisLam
2021-07-27 23:13:03 +08:00
parent 47d830db1f cafd2c7388
commit 934b797623
30 changed files with 442 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/server.js
View File

@@ -235,6 +235,7 @@ let needSetup = false;
bean.url = monitor.url
bean.interval = monitor.interval
bean.hostname = monitor.hostname;
bean.maxretries = monitor.maxretries;
bean.port = monitor.port;
bean.keyword = monitor.keyword;
@@ -544,12 +545,12 @@ async function afterLogin(socket, user) {
let monitorList = await sendMonitorList(socket)
for (let monitorID in monitorList) {
await sendHeartbeatList(socket, monitorID);
await sendImportantHeartbeatList(socket, monitorID);
await Monitor.sendStats(io, monitorID, user.id)
sendHeartbeatList(socket, monitorID);
sendImportantHeartbeatList(socket, monitorID);
Monitor.sendStats(io, monitorID, user.id)
}
await sendNotificationList(socket)
sendNotificationList(socket)
}
async function getMonitorJSONList(userID) {