Better socket support and skipConsole 4 JsConsole

2 files changed, 20 insertions, 9 deletions

diff --git a/lib/loggers/console.js b/lib/loggers/console.js
index e8f4d86..c8e3036 100644
--- a/lib/loggers/console.js
+++ b/lib/loggers/console.js
@@ -40,13 +40,15 @@
         for (i = 0; i < arguments.length; i++) {
           // We're not formatting objects for now.
 
-          if (typeof arguments[i].message === 'object') {
-            message.push(arguments[i].message);
-          } else {
-            message.push(this.format(arguments[i]));
-          }
-          if (!severity) {
-            severity = arguments[i]._level
+          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
+            }
           }
         }
 
diff --git a/lib/loggers/socket.js b/lib/loggers/socket.js
index d9ae055..739c5b3 100644
--- a/lib/loggers/socket.js
+++ b/lib/loggers/socket.js
@@ -18,8 +18,17 @@
     prototype : {
       serverUrl : '/',
 
-      init : function () {
-        this._socket = io.connect(this.serverUrl);
+      init : function (config) {
+        var logger = this;
+        logger.socketIo = io;
+
+        if (config) {
+          for (property in config) {
+            logger[property] = config[property];
+          }
+        }
+
+        logger._socket = logger.socketIo.connect(logger.serverUrl);
       },
 
       log : function () {