X-Git-Url: https://git.r.bdr.sh/rbdr/cologne/blobdiff_plain/c35e454310676fa3fca931bdb5c4e56a01775ef4..963cb46b688216154f1299c233832258be5f5bbd:/lib/cobalt.js

diff --git a/lib/cobalt.js b/lib/cobalt.js
index 5ae39f2..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
@@ -29,7 +27,7 @@
   }
 
   Cobalt.now = function () {
-    if (typeof performance !== 'undefined') {
+    if (typeof performance !== 'undefined' && performance.timing) {
       return performance.timing.navigationStart + performance.now();
     }
 
@@ -40,6 +38,23 @@
     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",
@@ -82,7 +97,7 @@
           if (typeof item !== "object") {
             item = {message : item.toString() };
           } else {
-            item.message = JSON.stringify(item);
+            item.message = Cobalt.stringify(item);
           }
 
           item._cobaltLog = true;
@@ -224,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) {
@@ -274,6 +281,8 @@
     global.Formatter = Cobalt.Formatter;
     global.Logger = Cobalt.Logger;
     global.Console = Cobalt.Console;
+    global.now = Cobalt.now;
+    global.stringify = Cobalt.stringify;
   } else {
     global.Cobalt = Cobalt;
   }