github
/
uptime-kuma
mirror of https://github.com/louislam/uptime-kuma
1
0
Fork 0
Code Issues Releases Wiki Activity

added connection timeout and refactored code

pull/875/head
Tarun Singh 2021-11-22 03:21:53 -05:00
parent 3306f4a8e0
commit 35da8c78f4
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/model/monitor.js
View File

@ -321,7 +321,12 @@ class Monitor extends BeanModel {
}
} else if (this.type === "mqtt") {
try {
bean.msg = await mqttAsync(this.url, this.mqttPort, this.mqttUsername, this.mqttPassword, this.mqttTopic, this.mqttSuccessMessage);
bean.msg = await mqttAsync(this.url, this.mqttTopic, this.mqttSuccessMessage, {
mqttPort: this.mqttPort,
mqttUsername: this.mqttUsername,
mqttPassword: this.mqttPassword,
interval: this.interval,
});
bean.status = UP;
} catch (error) {
bean.status = DOWN;

6
server/util-server.js
View File

@ -90,8 +90,9 @@ exports.pingAsync = function (hostname, ipv6 = false) {
});
};
exports.mqttAsync = function (hostname, port = undefined, username = undefined, password = undefined, topic, okMessage) {
exports.mqttAsync = function (hostname, topic, okMessage, options = {}) {
return new Promise((resolve, reject) => {
const { port, username, password, interval = 20 } = options;
try {
let client = mqtt.connect(hostname, {
port,
@ -112,6 +113,9 @@ exports.mqttAsync = function (hostname, port = undefined, username = undefined,
}
}
});
setTimeout(() => {
client.end();
}, interval * 1000);
} catch (error) {
reject(new Error(error));
}