Merge pull request #451 from adpdigital/publishSubscriptions

Introduce publishSubscriptions option, so that subscription $SYS topic can be switched off

lib/options.js

@@ -61,7 +61,8 @@ function modernize(legacy) {
     "maxInflightMessages",
     "stats",
     "publishNewClient",
-    "publishClientDisconnect"
+    "publishClientDisconnect",
+    "publishSubscriptions"
   ];
 
   // copy all conserved options
@@ -250,7 +251,8 @@ function validate(opts, validationOptions) {
       'maxInflightMessages': { type: 'integer' },
       'stats': { type: 'boolean' },
       'publishNewClient': { type: 'boolean' },
-      'publishClientDisconnect': { type: 'boolean' }
+      'publishClientDisconnect': { type: 'boolean' },
+      'publishSubscriptions': { type: 'boolean' }
     }
   });
 
@@ -333,6 +335,7 @@ function defaultsLegacy() {
     stats: false,
     publishNewClient: true,
     publishClientDisconnect: true,
+    publishSubscriptions: true,
     maxInflightMessages: 1024,
     logger: {
       name: "mosca",
@@ -368,6 +371,7 @@ function defaultsModern() {
     stats: false,
     publishNewClient: true,
     publishClientDisconnect: true,
+    publishSubscriptions: true,
     maxInflightMessages: 1024,
     logger: {
       name: "mosca",

lib/server.js

@@ -67,6 +67,7 @@ var nop = function() {};
  *  - `stats`, publish the stats every 10s (default false).
  *  - `publishNewClient`, publish message to topic "$SYS/{broker-id}/new/clients" when new client connects.
  *  - `publishClientDisconnect`, publish message to topic "$SYS/{broker-id}/disconnect/clients" when a client disconnects.
+ *  - `publishSubscriptions`, publish message to topic "$SYS/{broker-id}/new/(un)subscribes" when a client subscribes/unsubscribes.
  *
  * Interface may contain following properties:
  *  - `type`, name of a build-in type or a custom type factory
@@ -261,25 +262,27 @@ function Server(opts, callback) {
     );
   });
 
-  that.on("subscribed", function(topic, client) {
-    that.publish({
-      topic: "$SYS/" + that.id + "/new/subscribes",
-      payload: JSON.stringify({
-        clientId: client.id,
-        topic: topic
-      })
+  if(that.modernOpts.publishSubscriptions) {
+    that.on("subscribed", function(topic, client) {
+      that.publish({
+        topic: "$SYS/" + that.id + "/new/subscribes",
+        payload: JSON.stringify({
+          clientId: client.id,
+          topic: topic
+        })
+      });
     });
-  });
 
-  that.on("unsubscribed", function(topic, client) {
-    that.publish({
-      topic: "$SYS/" + that.id + "/new/unsubscribes",
-      payload: JSON.stringify({
-        clientId: client.id,
-        topic: topic
-      })
+    that.on("unsubscribed", function(topic, client) {
+      that.publish({
+        topic: "$SYS/" + that.id + "/new/unsubscribes",
+        payload: JSON.stringify({
+          clientId: client.id,
+          topic: topic
+        })
+      });
     });
-  });
+  }
 
   that.on("clientDisconnected", function(client) {
     if(that.modernOpts.publishClientDisconnect) {