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

Feat: Allow MQTT successMessage to be optional

This commit is contained in:
Nelson Chan 2022-04-18 13:04:55 +08:00
parent c28b90feb4
commit cd38dd3f68
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/util-server.js
View File

@ -135,10 +135,10 @@ exports.mqttAsync = function (hostname, topic, okMessage, options = {}) {
if (messageTopic == topic) { if (messageTopic == topic) {
client.end(); client.end();
clearTimeout(timeoutID); clearTimeout(timeoutID);
if (message.toString() === okMessage) { if (okMessage != null && okMessage !== "" && message.toString() !== okMessage) {
resolve(`Topic: ${messageTopic}; Message: ${message.toString()}`); reject(new Error(`Message Mismatch - Topic: ${messageTopic}; Message: ${message.toString()}`));
} else { } else {
reject(new Error(`Error; Topic: ${messageTopic}; Message: ${message.toString()}`)); resolve(`Topic: ${messageTopic}; Message: ${message.toString()}`);
} }
} }
}); });

2
src/pages/EditMonitor.vue
View File

@ -141,7 +141,7 @@
<div class="my-3"> <div class="my-3">
<label for="mqttSuccessMessage" class="form-label">MQTT {{ $t("successMessage") }}</label> <label for="mqttSuccessMessage" class="form-label">MQTT {{ $t("successMessage") }}</label>
<input id="mqttSuccessMessage" v-model="monitor.mqttSuccessMessage" type="text" class="form-control" required> <input id="mqttSuccessMessage" v-model="monitor.mqttSuccessMessage" type="text" class="form-control">
<div class="form-text"> <div class="form-text">
{{ $t("successMessageExplanation") }} {{ $t("successMessageExplanation") }}
</div> </div>