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

Remove try-catch and fix username/password/port not working for mqtt

Browse Source
This commit is contained in:
Louis Lam
2022-04-17 01:06:47 +08:00
parent 566133e350
commit e34420368b
2 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
server/model/monitor.js
View File

@@ -87,6 +87,7 @@ class Monitor extends BeanModel {
notificationIDList,
tags: tags,
mqttUsername: this.mqttUsername,
mqttPassword: this.mqttPassword,
mqttTopic: this.mqttTopic,
mqttSuccessMessage: this.mqttSuccessMessage
};
@@ -400,20 +401,13 @@ class Monitor extends BeanModel {
throw new Error("Server not found on Steam");
}
} else if (this.type === "mqtt") {
try {
bean.msg = await mqttAsync(this.hostname, this.mqttTopic, this.mqttSuccessMessage, {
mqttPort: this.port,
mqttUsername: this.mqttUsername,
mqttPassword: this.mqttPassword,
interval: this.interval,
});
bean.status = UP;
} catch (error) {
if (error.message !== "Timeout") {
bean.status = DOWN;
bean.msg = error.message;
}
}
bean.msg = await mqttAsync(this.hostname, this.mqttTopic, this.mqttSuccessMessage, {
port: this.port,
username: this.mqttUsername,
password: this.mqttPassword,
interval: this.interval,
});
bean.status = UP;
} else {
bean.msg = "Unknown Monitor Type";
bean.status = PENDING;