Better socket support and skipConsole 4 JsConsole

[rbdr/cologne] / lib / loggers / console.js

diff --git a/lib/loggers/console.js b/lib/loggers/console.js
index dc077c8858b1d6afa5b9d154896da6a2c0cb311e..c8e3036bc8497ca44d8a5abaf592bdbe348b4c22 100644 (file)
--- a/lib/loggers/console.js
+++ b/lib/loggers/console.js
@@ -35,34 +35,40 @@
       },
 
       log : function () {
-        var i, messageArray = [], message, severity;
+        var i, message = [], severity;
 
         for (i = 0; i < arguments.length; i++) {
-          messageArray.push(this.format(arguments[i]));
-          if (!severity) {
-            severity = arguments[i]._level
+          // We're not formatting objects for now.
+
+          if (!arguments[i].__skipConsole && !arguments[i].message.__skipConsole) {
+            if (typeof arguments[i].message === 'object') {
+              message.push(arguments[i].message);
+            } else {
+              message.push(this.format(arguments[i]));
+            }
+            if (!severity) {
+              severity = arguments[i]._level
+            }
           }
         }
 
-        message = messageArray.join(' ');
-
         switch (severity){
           case 0:
           case 1:
           case 2:
           case 3:
-            this.console.error(message);
+            this.console.error.apply(this.console, message);
             break;
           case 4:
-            this.console.warn(message);
+            this.console.warn.apply(this.console, message);
             break;
           case 5:
           case 6:
-            this.console.info(message);
+            this.console.info.apply(this.console, message);
             break;
           case 7:
           default:
-            this.console.log(message);
+            this.console.log.apply(this.console, message);
             break;
         }
       },
@@ -74,7 +80,7 @@
           return this.formatter.format(logObject, this.formatterOpts);
         }
 
-        return logObject;
+        return logObject.message;
       }
     }
   });