merge

Losant · Sep 14, 2017 · ee259b0 · ee259b0
2 parents 0f67dfe + 0ed5997
commit ee259b0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/mqtt.js b/lib/mqtt.js
@@ -52,7 +52,7 @@ MQTT.prototype.connect = function(options, callback) {
   var prefixPort = transportPrefixes[options.transport] ||
     transportPrefixes.tls;
 
-  var url = prefixPort.prefix + config.mqttEndpoint;
+  var url = prefixPort.prefix + (options.mqttEndpoint || config.mqttEndpoint);
 
   callback = callback || function() {};
 
@@ -63,7 +63,7 @@ MQTT.prototype.connect = function(options, callback) {
     url, { clientId: options.id,
       username: options.key,
       password: options.secret,
-      port: prefixPort.port });
+      port: options.port || prefixPort.port });
 
   this.client.on('connect', (function() {
     debug('MQTT successfully connected to ' + url);