ric/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-11-27 16:54:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Undo parm changes

Browse source
This commit is contained in:
Domenic Horner 2021-09-04 20:08:18 +08:00
parent b0acda52f9
commit 41d32bb9dd
3 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
server/model/monitor.js
View file

@ -270,9 +270,18 @@ class Monitor extends BeanModel {
this.id,
])
let text;
if (bean.status === UP) {
text = "✅ Up"
} else {
text = "🔴 Down"
}
let msg = `[${this.name}] [${text}] ${bean.msg}`;
for (let notification of notificationList) {
try {
await Notification.send(JSON.parse(notification.config), this.name, await this.toJSON(), bean.toJSON())
await Notification.send(JSON.parse(notification.config), msg, await this.toJSON(), bean.toJSON())
} catch (e) {
console.error("Cannot send notification to " + notification.name);
console.log(e);

14
server/notification.js
View file

@ -17,21 +17,9 @@ class Notification {
* @returns {Promise<string>} Successful msg
* Throw Error with fail msg
*/
static async send(notification, monitorName = null, monitorJSON = null, heartbeatJSON = null) {
static async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
let okMsg = "Sent Successfully. ";
let msg = `[${notification.name}] Testing`;
// heartbeatJSON is only defined if we're not testing
if(heartbeatJSON) {
let text;
if (heartbeatJSON["status"] === UP) {
text = "✅ Up"
} else {
text = "🔴 Down"
}
msg = `[${monitorName}] [${text}] ${heartbeatJSON["msg"]}`;
}
if (notification.type === "telegram") {
try {
await axios.get(`https://api.telegram.org/bot${notification.telegramBotToken}/sendMessage`, {

2
server/server.js
View file

@ -552,7 +552,7 @@ let indexHTML = fs.readFileSync("./dist/index.html").toString();
try {
checkLogin(socket)
let msg = await Notification.send(notification)
let msg = await Notification.send(notification, notification.name + " Testing")
callback({
ok: true,