Refactored and improved logger setup.

Author: mcollina

lib/client.js

@@ -17,7 +17,7 @@ var rewriteTopic = function(topic) {
 function Client(conn, server) {
   this.connection = conn;
   this.server = server;
-  this.logger = server.logger;
+  this.logger = server.logger.child({ client: this }, true);
   this.subscriptions = {};
 
   this.nextId = 0;
@@ -226,7 +226,6 @@ Client.prototype.handleConnect = function(packet) {
   var that = this, logger = this.logger, client = this.connection;
 
   this.id = packet.clientId;
-  logger = that.logger.child({ client: this });
 
   if (this.id.length > 23) {
     client.connack({

lib/server.js

@@ -38,6 +38,7 @@ var defaults = {
  *  - `baseRetryTimeout`, the retry timeout for the exponential
  *    backoff algorithm (default is 1s).
  *  - `logger`, the options for Bunyan.
+ *  - `logger.childOf`, the parent Bunyan logger.
  *  - `persitance`, the options for the persistence.
  *     A sub-key `factory` is used to specify what persitance
  *     to use.
@@ -75,7 +76,15 @@ function Server(opts, callback) {
   callback = callback || function() {};
 
   this.clients = {};
-  this.logger = bunyan.createLogger(this.opts.logger);
+  
+  if (this.opts.logger.childOf) {
+    this.logger = this.opts.logger.childOf;
+    delete this.opts.logger.childOf;
+    delete this.opts.logger.name;
+    this.logger = this.logger.child(this.opts.logger);
+  } else {
+    this.logger = bunyan.createLogger(this.opts.logger);
+  }
 
   var that = this;
 

test/common.js

@@ -38,7 +38,7 @@ global.moscaSettings = function() {
   return {
     port: nextPort(),
     logger: {
-      name: "moscaTests",
+      childOf: globalLogger,
       level: 60
     }
   };