From: Ben Beltran Date: Wed, 22 May 2013 20:55:13 +0000 (-0500) Subject: Pass the objects directly to the console. X-Git-Url: https://git.r.bdr.sh/rbdr/cologne/commitdiff_plain/73ca23120543f14672a960bb343db2bee676620b?ds=inline;hp=--cc Pass the objects directly to the console. --- 73ca23120543f14672a960bb343db2bee676620b diff --git a/lib/cobalt.js b/lib/cobalt.js index 17e6948..d2d2c13 100644 --- a/lib/cobalt.js +++ b/lib/cobalt.js @@ -91,23 +91,19 @@ // Builds a Cobalt Log Object buildLog : function (item, level) { - var co = this, oldItem; + var co = this, oldItem, logObject = {}; if (!item._cobaltLog) { - if (typeof item !== "object") { - 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); - item._version = co.version; - item._timestamp = co.now(); - item._indentLevel = co.currentIndent; - item._color = co.currentColor; + logObject.message = item; + logObject._cobaltLog = true; + logObject._from = co.from; + logObject._level = item._level || level || 7; + logObject._levelString = co._levelString(item._level); + logObject._version = co.version; + logObject._timestamp = co.now(); + logObject._indentLevel = co.currentIndent; + logObject._color = co.currentColor; + return logObject; } return item; diff --git a/lib/loggers/console.js b/lib/loggers/console.js index dc077c8..e8f4d86 100644 --- a/lib/loggers/console.js +++ b/lib/loggers/console.js @@ -35,34 +35,38 @@ }, log : function () { - var i, messageArray = [], message, severity; + var i, message = [], severity; for (i = 0; i < arguments.length; i++) { - messageArray.push(this.format(arguments[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 } } - 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 +78,7 @@ return this.formatter.format(logObject, this.formatterOpts); } - return logObject; + return logObject.message; } } });