From: Ben Beltran Date: Wed, 15 Jan 2014 18:04:20 +0000 (-0600) Subject: Normalizes buildLog and adds extendLog X-Git-Url: https://git.r.bdr.sh/rbdr/cologne/commitdiff_plain/2e8bfe95f50f936a9e8631da89d6def33f91d4db?ds=inline;hp=be5273269197cf913e9a9269733299814e83019c Normalizes buildLog and adds extendLog buildLog now generates default messages as INFO instead of DEBUG. Similarly, now includes the _separator flag as false for consistnecy. It also properly handles undefined and null. Finally, it creates extendLog which extends a dummy objectLog with the passed object. --- diff --git a/lib/cobalt.js b/lib/cobalt.js index f949b6a..f3effcd 100644 --- a/lib/cobalt.js +++ b/lib/cobalt.js @@ -93,24 +93,39 @@ buildLog : function (item, level) { var co = this, oldItem, logObject = {}; - item = item || {}; - - if (!item._cobaltLog) { + if (typeof item === "undefined" || item === null || !item._cobaltLog) { logObject.message = item; logObject._cobaltLog = true; logObject._from = co.from; - logObject._level = item._level || level || 7; - logObject._levelString = co._levelString(item._level); + logObject._level = level || 6; + logObject._levelString = co._levelString(logObject._level); logObject._version = co.version; logObject._timestamp = co.now(); logObject._indentLevel = co.currentIndent; logObject._color = co.currentColor; + logObject._separator = false; return logObject; } return item; }, + extendLog : function (extendingObject) { + var co = this, logObject, + property; + + logObject = co.buildLog(undefined, 6); + extendingObject = extendingObject || {}; + + for (property in extendingObject) { + if (extendingObject.hasOwnProperty(property)) { + logObject[property] = extendingObject[property]; + } + } + + return logObject; + }, + buildSeparator : function (type) { var co = this; return {