[api] Rexpose colorize in a way that merges all available colors

winstonjs · Feb 2, 2011 · afe9b53 · afe9b53
1 parent 1119425
commit afe9b53
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 22 deletions.
diff --git a/lib/winston.js b/lib/winston.js
@@ -30,7 +30,6 @@ winston.findTransport = function (transport) {
 var utils      = require('utils');
 winston.hash   = utils.hash;
 winston.clone  = utils.clone;
-winston.size   = utils.size;
 winston.config = require('winston/config');
 winston.Logger = require('winston/logger').Logger;
 

diff --git a/lib/winston/config.js b/lib/winston/config.js
@@ -8,16 +8,37 @@
 
 require.paths.unshift(__dirname);
 
-var colors = require('colors');
+var colors = require('colors'),
+    config = exports, 
+    allColors = {};
 
-var config = exports;
+function mixin (target) {
+  var args = Array.prototype.slice.call(arguments, 1);
+
+  args.forEach(function (a) {
+    var keys = Object.keys(a);
+    for (var i = 0; i < keys.length; i++) {
+      target[keys[i]] = a[keys[i]];
+    }
+  });
+  return target;
+};
+
+config.add = function (name, settings) {
+  mixin(allColors, settings.colors);
+  Object.defineProperty(config, name, {
+    get: function () {
+      return settings;
+    }
+  })
+};
+
+config.colorize = function (level) {
+  return level[allColors[level]];
+};
 
 //
 // Export config sets
 //
-config.npm    = require('config/npm-config');
-config.syslog = require('config/syslog-config');
-
-var colorize = exports.colorize = function (level) {
-  return level[exports.colors[level]];
-};
+config.add('npm', require('config/npm-config'));
+config.add('syslog', require('config/syslog-config'));
diff --git a/lib/winston/utils/index.js b/lib/winston/utils/index.js
@@ -63,18 +63,6 @@ var clone = exports.clone = function (obj) {
   return clone;
 };
 
-//
-// TODO finalize where this should be put. Utils, Index?
-//
-exports.size = function(obj) {
-  var size = 0, key;
-  for (key in obj) {
-    if (obj.hasOwnProperty(key)) size++;
-  }
-
-  return size;
-};
-
 var months = ['Jan', 'Feb', 'Mar', 'Apr', 
               'May', 'Jun', 'Jul', 'Aug', 
               'Sep', 'Oct', 'Nov', 'Dec'];
@@ -103,7 +91,7 @@ var timestamp = exports.timestamp = function () {
 //
 var log = exports.log = function (level, msg, meta, colorize) {
   var output = timestamp() + ' - ';
-      targetLevel = colorize ? levels.colorize(level) : level;
+      targetLevel = colorize ? config.colorize(level) : level;
 
   output += targetLevel + ': ' + msg;