Merge pull request #448 from cfchou/dev_160401

configurable maxConnections per interface
moscajs · Apr 14, 2016 · 1ff1eb9 · 1ff1eb9
2 parents 48a6580 + df9c91f
commit 1ff1eb9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/lib/options.js b/lib/options.js
@@ -123,6 +123,10 @@ function modernize(legacy) {
         mqtt_interface.port = legacy.port;
       }
 
+      if (legacy.hasOwnProperty('maxConnections')) {
+        mqtt_interface.maxConnections = legacy.maxConnections;
+      }
+
       modernized.interfaces.push(mqtt_interface);
     }
 
@@ -320,6 +324,7 @@ function defaultsLegacy() {
   return {
     port: 1883,
     host: null,
+    maxConnections: 10000000,
     backend: {
       json: false,
       wildcardOne: '+',
@@ -353,7 +358,7 @@ function defaultsModern() {
   return {
     host: null,
     interfaces: [
-      { type: "mqtt", port: 1883 }
+      { type: "mqtt", port: 1883, maxConnections: 10000000 }
     ],
     backend: {
       json: false,

diff --git a/lib/server.js b/lib/server.js
@@ -207,7 +207,7 @@ function Server(opts, callback) {
 
         var server = interfaces.serverFactory(iface, fallback, that);
         that.servers.push(server);
-        server.maxConnections = 10000000;
+        server.maxConnections = iface.maxConnections || 10000000;
         server.listen(port, host, dn);
       }, done);
     },

diff --git a/test/options.js b/test/options.js
@@ -56,7 +56,7 @@ describe("mocha.options", function () {
       expect(modern).to.have.property("interfaces");
       expect(modern.interfaces).to.be.deep.equal(
         [
-          { type: "mqtt", port: 1883 }
+          { type: "mqtt", port: 1883, maxConnections: 10000000 }
         ]
       );
     });