Merge 23134b2 into 3f8d6a7

moscajs · Mar 29, 2017 · 3a86a00 · 3a86a00
2 parents 3f8d6a7 + 23134b2
commit 3a86a00
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -79,7 +79,7 @@ server.listen(8883, function () {
 Creates a new instance of Aedes.
 
 Options:
-
+* `id`: an id of broker, defaults generated by [shortid](https://www.npmjs.com/package/shortid) 
 * `mq`: an instance of [MQEmitter](http://npm.im/mqemitter),
   such as [MQEmitterRedis](http://npm.im/mqemitter-redis)
   or [MQEmitterMongoDB](http://npm.im/mqemitter-mongodb)

diff --git a/aedes.js b/aedes.js
@@ -35,7 +35,7 @@ function Aedes (opts) {
 
   opts = xtend(defaultOptions, opts)
 
-  this.id = shortid()
+  this.id = opts.id || shortid()
   this.counter = 0
   this.connectTimeout = opts.connectTimeout
   this.mq = opts.mq || mqemitter(opts)