koichixD/uptime-kuma
1
0
Fork 0
mirror of https://github.com/koichixD/uptime-kuma.git synced 2026-09-04 09:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflict in server/server.js and server/uptime-kuma-server.js

Browse Source
This commit is contained in:
iotux
2025-12-17 17:49:59 +01:00
parent 0dda5c3e1d 3b0ab450d3
commit 77d0e73878
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/server.js
+9
View File
@@ -1248,6 +1248,9 @@ let needSetup = false;
monitorID,
value,
]);
await server.sendUpdateMonitorIntoList(socket, monitorID);
callback({
ok: true,
msg: "successAdded",
@@ -1271,6 +1274,9 @@ let needSetup = false;
tagID,
monitorID,
]);
await server.sendUpdateMonitorIntoList(socket, monitorID);
callback({
ok: true,
msg: "successEdited",
@@ -1294,6 +1300,9 @@ let needSetup = false;
monitorID,
value,
]);
await server.sendUpdateMonitorIntoList(socket, monitorID);
callback({
ok: true,
msg: "successDeleted",
server/uptime-kuma-server.js
+3 -1
View File
@@ -223,7 +223,9 @@ class UptimeKumaServer {
*/
async sendUpdateMonitorIntoList(socket, monitorID) {
let list = await this.getMonitorJSONList(socket.userID, monitorID);
this.io.to(socket.userID).emit("updateMonitorIntoList", list);
if (list && list[monitorID]) {
this.io.to(socket.userID).emit("updateMonitorIntoList", list);
}
}
/**