New changes from nitro

2 files changed, 28 insertions, 7 deletions

diff --git a/lib/loggers/console.js b/lib/loggers/console.js
index 3dc4b1d..5002502 100644
--- a/lib/loggers/console.js
+++ b/lib/loggers/console.js
@@ -16,7 +16,7 @@
 
   Cobalt.Logger.JsConsole = Class(Cobalt.Logger, 'JsConsole')({
     prototype : {
-      console : console,
+      console : null,
       formatterOpts : {},
 
       init : function (config) {
@@ -30,12 +30,19 @@
         }
       },
 
-      log : function (logObject) {
-        var message;
+      log : function () {
+        var i, messageArray = [], message, severity;
 
-        message = this.format(logObject);
+        for (i = 0; i < arguments.length; i++) {
+          messageArray.push(this.format(arguments[i]));
+          if (!severity) {
+            severity = arguments[i]._level
+          }
+        }
+
+        message = messageArray.join(' ');
 
-        switch (logObject._level){
+        switch (severity){
           case 0:
           case 1:
           case 2:
@@ -68,6 +75,10 @@
     }
   });
 
+  if (Cobalt.Logger.JsConsole.__objectSpy) {
+    Cobalt.Logger.JsConsole.__objectSpy.destroy();
+  }
+
   if (typeof require === 'function') {
     global.JsConsole = Cobalt.Logger.JsConsole;
   } else {
diff --git a/lib/loggers/socket.js b/lib/loggers/socket.js
index 8d0ff55..d9ae055 100644
--- a/lib/loggers/socket.js
+++ b/lib/loggers/socket.js
@@ -22,12 +22,22 @@
         this._socket = io.connect(this.serverUrl);
       },
 
-      log : function (logObject) {
-        this._socket.emit('log', logObject);
+      log : function () {
+        var i, messageArray = [];
+
+        for (i = 0; i < arguments.length; i++) {
+          messageArray.push(arguments[i]);
+        }
+
+        this._socket.emit('log', messageArray);
       }
     }
   });
 
+  if (Cobalt.Logger.Socket.__objectSpy) {
+    Cobalt.Logger.Socket.__objectSpy.destroy();
+  }
+
   if (typeof require === 'function') {
     global.Socket = Cobalt.Logger.Socket;
   } else {