Merge pull request winstonjs#156 from FB55/master

Added util.format-like functionality

lib/winston/common.js

@@ -257,3 +257,28 @@ exports.serialize = function (obj, key) {
 
   return msg;
 };
+
+//
+// ### function format (arr)
+// #### @arr {Array} The array that contains all parts of the message
+// similar to util.format
+// returns the formated string
+// uses the original array and removes items as it proceeds
+//
+exports.format = function (arr) {
+  var msg = arr.shift();
+
+  if (typeof msg !== "string") {
+    return msg;
+  }
+
+  return msg.replace(/%[sdj%]/g, function (x){
+    switch (x.charAt(1)) {
+      case "j": return JSON.stringify(arr.shift());
+      case "s": return String(arr.shift());
+      case "d": return Number(arr.shift());
+      case "%": return "%";
+      default:  return x;
+    }
+  });
+};

lib/winston/logger.js

@@ -120,23 +120,25 @@ Logger.prototype.extend = function (target) {
 // #### @callback {function} Continuation to respond to when complete.
 // Core logging method exposed to Winston. Metadata is optional.
 //
-Logger.prototype.log = function (level, msg) {
+Logger.prototype.log = function (level) {
   var self = this,
+      args = Array.prototype.slice.call(arguments, 1),
+      msg = common.format(args),
       callback,
       meta;
 
-  if (arguments.length === 3) {
-    if (typeof arguments[2] === 'function') {
+  if (args.length === 1) {
+    if (typeof args[0] === 'function') {
       meta = {};
-      callback = arguments[2];
+      callback = args[0];
     }
-    else if (typeof arguments[2] === 'object') {
-      meta = arguments[2];
+    else if (typeof args[0] === 'object') {
+      meta = args[0];
     }
   }
-  else if (arguments.length === 4) {
-    meta = arguments[2];
-    callback = arguments[3];
+  else if (args.length === 2) {
+    meta = args[0];
+    callback = args[1];
   }
 
   // If we should pad for levels, do so
@@ -150,7 +152,7 @@ Logger.prototype.log = function (level, msg) {
     }
     else if (self.emitErrs) {
       self.emit('error', err);
-    };
+    }
   }
 
   if (this.transports.length === 0) {