frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

make sure MQTT client closes if redeploy during reconnect

Browse Source 
to close #1193
Thanks @tedhuang for the excellent problem determination
This commit is contained in:
Dave Conway-Jones 2017-03-10 20:12:52 +00:00 committed by Nick O'Leary
parent 15cd93c30f
commit 0c1c710afe
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nodes/core/io/10-mqtt.html
View File

@ -35,7 +35,7 @@
</script>
<script type="text/x-red" data-help-name="mqtt in">
<p>Connects to a broker and subscribes to the specified topic.</p>
<p>Connects to a MQTT broker and subscribes to the specified topic.</p>
<p>Outputs a message with the properties:</p>
<ul>
<li><code>msg.topic</code></li>
@ -107,6 +107,7 @@
<p>Connects to a MQTT broker and publishes messages.</p>
<p><code>msg.payload</code> is used as the payload of the published message.
If it contains an Object it will be converted to JSON before being sent.
If it contains a binary Buffer the message will be published as-is.
</p>
<p>The topic used can be configured in the node or, if left blank, can be set
by <code>msg.topic</code>.</p>
@ -299,7 +300,7 @@
id: "mqtt-broker-tab-will",
label: this._("mqtt.tabs-label.will")
});
setTimeout(function() { tabs.resize()},0);
setTimeout(function() { tabs.resize(); },0);
if (typeof this.cleansession === 'undefined') {
this.cleansession = true;
$("#node-config-input-cleansession").prop("checked",true);

2
nodes/core/io/10-mqtt.js
View File

@ -298,7 +298,7 @@ module.exports = function(RED) {
done();
});
this.client.end();
} else if (this.connecting) {
} else if (this.connecting || node.client.reconnecting) {
node.client.end();
done();
} else {