X-Git-Url: https://git.r.bdr.sh/rbdr/cologne/blobdiff_plain/95239994bffa025ebd0d6dc98b34f211fb7c8cc1..e16e2dbf4c0911a5d5e8d1d56bb1c674b37fc161:/lib/cobalt.js?ds=inline

diff --git a/lib/cobalt.js b/lib/cobalt.js
index 771c9c7..58a305c 100644
--- a/lib/cobalt.js
+++ b/lib/cobalt.js
@@ -19,8 +19,6 @@
   // Load up loggers + formatters
   if (typeof require === 'function') {
     // Formatters
-    Cobalt.Formatter.Simple = require('./formatters/simple.js').Simple;
-    Cobalt.Formatter.Ansi = require('./formatters/ansi.js').Ansi;
     Cobalt.Formatter.Token = require('./formatters/token.js').Token;
 
     // Loggers
@@ -28,6 +26,35 @@
     Cobalt.Logger.Socket = require('./loggers/socket.js').Socket;
   }
 
+  Cobalt.now = function () {
+    if (typeof performance !== 'undefined' && performance.timing) {
+      return performance.timing.navigationStart + performance.now();
+    }
+
+    if (typeof Microtime !== 'undefined') {
+      return Microtime.nowDouble() * 1000;
+    }
+
+    return Date.now();
+  }
+
+  // Stringify with circular dereference.
+  Cobalt.stringify = function (object) {
+    var cache = [], stringified;
+    stringified = JSON.stringify(object, function (key, value) {
+      if (typeof value === 'object' && value !== null) {
+        if (cache.indexOf(value) !== -1) {
+          return "[Circular]";
+        }
+        cache.push(value);
+      }
+      return value;
+    });
+    cache = null;
+
+    return stringified;
+  }
+
   Cobalt.Console = Class(Cobalt, 'Console')({
     prototype : {
       from : "Generic Cobalt Logger",
@@ -64,13 +91,16 @@
 
       // Builds a Cobalt Log Object
       buildLog : function (item, level) {
-        var co = this;
+        var co = this, oldItem;
 
         if (!item._cobaltLog) {
           if (typeof item !== "object") {
-            item = { _cobaltLog : true, message : item.toString() };
+            item = {message : item.toString() };
+          } else {
+            item.message = Cobalt.stringify(item);
           }
 
+          item._cobaltLog = true;
           item._from = co.from;
           item._level = item._level || level || 7;
           item._levelString = co._levelString(item._level);
@@ -99,15 +129,20 @@
       _log : function (severity) {
         var co = this,
             logString,
+            logObjectArray = [],
             i, j;
 
         for (i = 1; i < arguments.length; i++) {
-          logObject = co.buildLog(arguments[i], severity);
-
-          for (j = 0; j < co.loggers.length; j++) {
-            co.loggers[j].log(logObject);
+          if (typeof arguments[i] === 'undefined') {
+            logObjectArray.push(co.buildLog("undefined", severity));
+          } else {
+            logObjectArray.push(co.buildLog(arguments[i], severity));
           }
         }
+
+        for (j = 0; j < co.loggers.length; j++) {
+          co.loggers[j].log.apply(co.loggers[j], logObjectArray);
+        }
       },
 
       log : function () {
@@ -204,15 +239,7 @@
 
       // Returns the current time in microseconds.
       now : function () {
-        if (typeof performance !== 'undefined') {
-          return performance.timing.navigationStart + performance.now();
-        }
-
-        if (typeof Microtime !== 'undefined') {
-          return Microtime.nowDouble() * 1000;
-        }
-
-        return Date.now();
+        this.constructor.now();
       },
 
       _levelString : function (level) {
@@ -246,10 +273,16 @@
     }
   });
 
+  if (Cobalt.Console.__objectSpy) {
+    Cobalt.Console.__objectSpy.destroy();
+  }
+
   if (typeof require === 'function') {
     global.Formatter = Cobalt.Formatter;
     global.Logger = Cobalt.Logger;
     global.Console = Cobalt.Console;
+    global.now = Cobalt.now;
+    global.stringify = Cobalt.stringify;
   } else {
     global.Cobalt = Cobalt;
   }