mocha tests for new log4js

lib/log4js.js

@@ -44,25 +44,21 @@
  * Website: http://log4js.berlios.de
  */
 var debug = require('./debug')('core')
-, weak = require('weak')
 , fs = require('fs')
-, path = require('path')
 , util = require('util')
 , layouts = require('./layouts')
 , levels = require('./levels')
-, LoggingEvent = require('./logger').LoggingEvent
-, Logger = require('./logger').Logger
-, loggerRefs = []
-, categoryLevels = {}
-, globalLogLevel = null
-, ALL_CATEGORIES = '[all]'
+, Logger = require('./logger')
 , appenders = {}
+, categories = {}
 , appenderMakers = {}
 , defaultConfig =   {
-  appenders: [
-    { type: "console" }
-  ],
-  replaceConsole: false
+  appenders: {
+    console: { type: "console" }
+  },
+  categories: {
+    default: { level: levels.DEBUG, appenders: [ "console" ] }
+  }
 };
 
 /**
@@ -72,100 +68,9 @@ var debug = require('./debug')('core')
  * @static
  */
 function getLogger (categoryName) {
-  var level, logger, ref;
+  debug("getLogger(" + categoryName + ")");
 
-  // Use default logger if categoryName is not specified or invalid
-  if (typeof categoryName !== "string") {
-    categoryName = Logger.DEFAULT_CATEGORY;
-  }
-
-  level = categoryLevels[categoryName];
-
-  if (globalLogLevel) {
-    level = globalLogLevel;
-  }
-
-  debug("getLogger(" + categoryName + ") - level is " + level);
-  logger = new Logger(categoryName, level || null, dispatch);
-  ref = weak(logger);
-  loggerRefs.push(ref);
-
-  return logger;
-}
-
-/**
- * args are appender, then zero or more categories
- */
-function addAppender () {
-  var args = Array.prototype.slice.call(arguments);
-  var appender = args.shift();
-  if (args.length === 0 || args[0] === undefined) {
-    args = [ ALL_CATEGORIES ];
-  }
-  //argument may already be an array
-  if (Array.isArray(args[0])) {
-    args = args[0];
-  }
-  
-  args.forEach(function(category) {
-    addAppenderToCategory(appender, category);    
-  });
-}
-
-function addAppenderToCategory(appender, category) {
-  debug("adding appender " + appender + " to category " + category);
-  if (!appenders[category]) {
-    appenders[category] = [];
-  }
-  appenders[category].push(appender);
-}
-
-function clearAppenders () {
-  debug("clearing appenders");
-  appenders = {};
-}
-
-function configureAppenders(appenderList, options) {
-  clearAppenders();
-  if (appenderList) {
-    appenderList.forEach(function(appenderConfig) {
-      loadAppender(appenderConfig.type);
-      var appender;
-      appenderConfig.makers = appenderMakers;
-      try {
-        appender = appenderMakers[appenderConfig.type](appenderConfig, options);
-        addAppender(appender, appenderConfig.category);
-      } catch(e) {
-        throw new Error("log4js configuration problem for " + util.inspect(appenderConfig), e);
-      }
-    });
-  }
-}
-
-function configureLevels(levels) {
-  categoryLevels = levels || {};
-}
-
-function setGlobalLogLevel(level) {
-  //Logger.prototype.level = levels.toLevel(level, levels.TRACE);
-  globalLogLevel = level;
-  var workingRefs = [];
-  loggerRefs.forEach(function(logger) {
-    if (logger.setLevel) {
-      workingRefs.push(logger);
-      logger.setLevel(level);
-    }
-  });
-  loggerRefs = workingRefs;
-}
-
-/**
- * Get the default logger instance.
- * @return {Logger} instance of default logger
- * @static
- */
-function getDefaultLogger () {
-  return getLogger(Logger.DEFAULT_CATEGORY);
+  return new Logger(dispatch, categoryName || 'default');
 }
 
 /**
@@ -174,25 +79,17 @@ function getDefaultLogger () {
  */
 function dispatch(event) {
   debug("event is " + util.inspect(event));
-  debug("appenders is " + util.inspect(appenders));
-  if (appenders[event.categoryName]) {
-    debug("appender defined for " + event.categoryName);
-    dispatchToCategory(event.categoryName, event);
-  }
+  var category = categories[event.category] || categories.default;
+  debug("category.level[" + category.level + "] <= " + event.level + " ? " + category.level.isLessThanOrEqualTo(event.level));
 
-  if (appenders[ALL_CATEGORIES]) {
-    debug("appender defined for " + ALL_CATEGORIES);
-    dispatchToCategory(ALL_CATEGORIES, event);
+  if (category.level.isLessThanOrEqualTo(event.level)) {
+    category.appenders.forEach(function(appender) {
+      appenders[appender](event);
+    });
   }
 }
 
-function dispatchToCategory(category, event) {
-  appenders[category].forEach(function(appender) {
-    debug("Sending " + util.inspect(event) + " to appender " + appender);
-    appender(event);
-  });
-}
-
+/*
 var configState = {};
 
 function loadConfigurationFile(filename) {
@@ -251,8 +148,34 @@ function initReloadConfiguration(filename, options) {
   configState.lastMTime = getMTime(filename);
   configState.timerId = setInterval(reloadConfiguration, options.reloadSecs*1000);
 }
+*/
 
-function configure(configurationFileOrObject, options) {
+function load(file) {
+  return JSON.parse(fs.readFileSync(file, "utf-8"));
+}
+
+function configure(configurationFileOrObject) {
+  var filename, config = configurationFileOrObject || process.env.LOG4JS_CONFIG;
+  
+  if (!config || !(typeof config === 'string' || typeof config === 'object')) {
+    throw new Error("You must specify configuration as an object or a filename.");
+  }
+
+  if (typeof config === 'string') {
+    filename = config;
+    config = load(filename);
+  }
+
+  if (!config.appenders || !Object.keys(config.appenders).length) {
+    throw new Error("You must specify at least one appender.");
+  }
+
+  configureAppenders(config.appenders);
+
+  validateCategories(config.categories);
+  categories = config.categories;
+
+/*
   var config = configurationFileOrObject;
   config = config || process.env.LOG4JS_CONFIG;
   options = options || {};
@@ -270,8 +193,70 @@ function configure(configurationFileOrObject, options) {
     }
   }
   configureOnceOff(config, options);
+*/
 }
 
+function validateCategories(cats) { 
+  if (!cats || !cats.default) {
+    throw new Error("You must specify an appender for the default category");
+  }
+
+  Object.keys(cats).forEach(function(categoryName) {
+    var category = cats[categoryName], inputLevel = category.level;
+    if (!category.level) {
+      throw new Error("You must specify a level for category '" + categoryName + "'.");
+    }
+    category.level = levels.toLevel(inputLevel);
+    if (!category.level) {
+      throw new Error("Level '" + inputLevel + "' is not valid for category '" + categoryName + "'. Acceptable values are: " + levels.levels.join(', ') + ".");
+    }
+
+    if (!category.appenders || !category.appenders.length) {
+      throw new Error("You must specify an appender for category '" + categoryName + "'.");
+    }
+
+    category.appenders.forEach(function(appender) {
+      if (!appenders[appender]) {
+        throw new Error("Appender '" + appender + "' for category '" + categoryName + "' does not exist. Known appenders are: " + Object.keys(appenders).join(', ') + ".");
+      }
+    });
+  });
+}
+
+function clearAppenders () {
+  debug("clearing appenders");
+  appenders = {};
+}
+
+function configureAppenders(appenderMap) {
+  clearAppenders();
+  Object.keys(appenderMap).forEach(function(appenderName) {
+      var appender, appenderConfig = appenderMap[appenderName];
+      loadAppender(appenderConfig.type);
+      appenderConfig.makers = appenderMakers;
+      try {
+        appenders[appenderName] = appenderMakers[appenderConfig.type](appenderConfig);
+      } catch(e) {
+        throw new Error("log4js configuration problem for appender '" + appenderName + "'. Error was " + e.stack);
+      }
+  });
+}
+
+function loadAppender(appender) {
+  var appenderModule;
+  try {
+    appenderModule = require('./appenders/' + appender);
+  } catch (e) {
+    try {
+      appenderModule = require(appender);
+    } catch (err) {
+      throw new Error("Could not load appender of type '" + appender + "'.");
+    }
+  }
+  appenderMakers[appender] = appenderModule.configure.bind(appenderModule);
+}
+
+/*
 var originalConsoleFunctions = {
   log: console.log,
   debug: console.debug,
@@ -298,40 +283,29 @@ function restoreConsole() {
   });
 }
 
-function loadAppender(appender) {
-  var appenderModule;
-  try {
-    appenderModule = require('./appenders/' + appender);
-  } catch (e) {
-    appenderModule = require(appender);
-  }
-  module.exports.appenders[appender] = appenderModule.appender.bind(appenderModule);
-  appenderMakers[appender] = appenderModule.configure.bind(appenderModule);
-}
-
+*/
 module.exports = {
   getLogger: getLogger,
-  getDefaultLogger: getDefaultLogger,
-  dispatch: dispatch,
-  
+/*  
   addAppender: addAppender,
   loadAppender: loadAppender,
   clearAppenders: clearAppenders,
+*/
   configure: configure,
-  
+/*  
   replaceConsole: replaceConsole,
   restoreConsole: restoreConsole,
   
   levels: levels,
-  setGlobalLogLevel: setGlobalLogLevel,
   
   layouts: layouts,
   appenders: {},
   appenderMakers: appenderMakers,
   connectLogger: require('./connect-logger').connectLogger
+*/
 };
 
 //set ourselves up
-debug("Starting configuration");
-configure();
+//debug("Starting configuration");
+//configure();