Merge branch 'master' of github.com:adamvr/MQTT.js

mqttjs · Nov 21, 2013 · 748b87e · 748b87e
2 parents 42944be + a67bd37
commit 748b87e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -89,6 +89,7 @@ client.publish('messages', 'hello me!');
 client.on('message', function(topic, message) {
   console.log(message);
 });
+client.options.reconnectPeriod = 0;  // disable automatic reconnect
 ```
 
 ### Chainable API!
@@ -158,3 +159,7 @@ mqtt.createServer(function(client) {
   });
 }).listen(1883);
 ```
+
+## License
+
+MIT
diff --git a/lib/client.js b/lib/client.js
@@ -384,7 +384,7 @@ MqttClient.prototype._reconnect = function() {
 MqttClient.prototype._setupReconnect = function() {
   var that = this;
 
-  if (!that.disconnecting && !that.reconnectTimer) {
+  if (!that.disconnecting && !that.reconnectTimer && (that.options.reconnectPeriod > 0)) {
     that.reconnectTimer = setInterval(function () {
       that._reconnect();
     }, that.options.reconnectPeriod);

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "author": "Adam Rudd <adam.rudd@uqconnect.edu.au>",
   "name": "mqtt",
   "description": "A library for the MQTT protocol",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "contributors": [
     "Matteo Collina <matteo.collina@gmail.com> (https://github.com/mcollina)"
   ],