Andrey/uptime-kuma
1
0
Fork 0
Code Issues Pull Requests Actions 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
commit 77d0e73878
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/server.js
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",

4
server/uptime-kuma-server.js
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);
}
}
/**