changed logger to not use events. everything is broken
This commit is contained in:
+32
-48
@@ -43,7 +43,7 @@
|
||||
* @static
|
||||
* Website: http://log4js.berlios.de
|
||||
*/
|
||||
var events = require('events')
|
||||
var debug = require('./debug')('log4js-core')
|
||||
, fs = require('fs')
|
||||
, path = require('path')
|
||||
, util = require('util')
|
||||
@@ -51,9 +51,9 @@ var events = require('events')
|
||||
, levels = require('./levels')
|
||||
, LoggingEvent = require('./logger').LoggingEvent
|
||||
, Logger = require('./logger').Logger
|
||||
, categoryLevels = {}
|
||||
, ALL_CATEGORIES = '[all]'
|
||||
, appenders = {}
|
||||
, loggers = {}
|
||||
, appenderMakers = {}
|
||||
, defaultConfig = {
|
||||
appenders: [
|
||||
@@ -75,25 +75,9 @@ function getLogger (categoryName) {
|
||||
categoryName = Logger.DEFAULT_CATEGORY;
|
||||
}
|
||||
|
||||
var appenderList;
|
||||
if (!loggers[categoryName]) {
|
||||
// Create the logger for this name if it doesn't already exist
|
||||
loggers[categoryName] = new Logger(categoryName);
|
||||
if (appenders[categoryName]) {
|
||||
appenderList = appenders[categoryName];
|
||||
appenderList.forEach(function(appender) {
|
||||
loggers[categoryName].addListener("log", appender);
|
||||
});
|
||||
}
|
||||
if (appenders[ALL_CATEGORIES]) {
|
||||
appenderList = appenders[ALL_CATEGORIES];
|
||||
appenderList.forEach(function(appender) {
|
||||
loggers[categoryName].addListener("log", appender);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
return loggers[categoryName];
|
||||
debug("getLogger(" + categoryName + ")");
|
||||
|
||||
return new Logger(categoryName, levels.toLevel(categoryLevels[categoryName]) || null);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -111,25 +95,12 @@ function addAppender () {
|
||||
}
|
||||
|
||||
args.forEach(function(category) {
|
||||
addAppenderToCategory(appender, category);
|
||||
|
||||
if (category === ALL_CATEGORIES) {
|
||||
addAppenderToAllLoggers(appender);
|
||||
} else if (loggers[category]) {
|
||||
loggers[category].addListener("log", appender);
|
||||
}
|
||||
addAppenderToCategory(appender, category);
|
||||
});
|
||||
}
|
||||
|
||||
function addAppenderToAllLoggers(appender) {
|
||||
for (var logger in loggers) {
|
||||
if (loggers.hasOwnProperty(logger)) {
|
||||
loggers[logger].addListener("log", appender);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function addAppenderToCategory(appender, category) {
|
||||
debug("adding appender " + appender + " to category " + category);
|
||||
if (!appenders[category]) {
|
||||
appenders[category] = [];
|
||||
}
|
||||
@@ -137,12 +108,8 @@ function addAppenderToCategory(appender, category) {
|
||||
}
|
||||
|
||||
function clearAppenders () {
|
||||
debug("clearing appenders");
|
||||
appenders = {};
|
||||
for (var logger in loggers) {
|
||||
if (loggers.hasOwnProperty(logger)) {
|
||||
loggers[logger].removeAllListeners("log");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function configureAppenders(appenderList, options) {
|
||||
@@ -163,13 +130,7 @@ function configureAppenders(appenderList, options) {
|
||||
}
|
||||
|
||||
function configureLevels(levels) {
|
||||
if (levels) {
|
||||
for (var category in levels) {
|
||||
if (levels.hasOwnProperty(category)) {
|
||||
getLogger(category).setLevel(levels[category]);
|
||||
}
|
||||
}
|
||||
}
|
||||
categoryLevels = levels || {};
|
||||
}
|
||||
|
||||
function setGlobalLogLevel(level) {
|
||||
@@ -185,6 +146,27 @@ function getDefaultLogger () {
|
||||
return getLogger(Logger.DEFAULT_CATEGORY);
|
||||
}
|
||||
|
||||
/**
|
||||
* Log event routing to appenders
|
||||
* This would be a good place to implement category hierarchies/wildcards, etc
|
||||
*/
|
||||
function dispatch(event) {
|
||||
debug("event is " + util.inspect(event));
|
||||
if (appenders[event.category]) {
|
||||
dispatchToCategory(event.category, event);
|
||||
}
|
||||
|
||||
if (appenders[ALL_CATEGORIES]) {
|
||||
dispatchToCategory(ALL_CATEGORIES, event);
|
||||
}
|
||||
}
|
||||
|
||||
function dispatchToCategory(category, event) {
|
||||
appenders[category].forEach(function(appender) {
|
||||
appender(event);
|
||||
});
|
||||
}
|
||||
|
||||
var configState = {};
|
||||
|
||||
function loadConfigurationFile(filename) {
|
||||
@@ -304,6 +286,7 @@ function loadAppender(appender) {
|
||||
module.exports = {
|
||||
getLogger: getLogger,
|
||||
getDefaultLogger: getDefaultLogger,
|
||||
dispatch: dispatch,
|
||||
|
||||
addAppender: addAppender,
|
||||
loadAppender: loadAppender,
|
||||
@@ -323,5 +306,6 @@ module.exports = {
|
||||
};
|
||||
|
||||
//set ourselves up
|
||||
debug("Starting configuration");
|
||||
configure();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user