Lazy load any new style appenders
This commit is contained in:
parent
25aa075fad
commit
23a2758a6d
@ -43,6 +43,7 @@ function createAppender(hookioOptions, actualAppender) {
|
||||
function configure(config) {
|
||||
var actualAppender;
|
||||
if (config.appender && config.mode === 'master') {
|
||||
log4js.loadAppender(config.appender.type);
|
||||
actualAppender = log4js.appenderMakers[config.appender.type](config.appender);
|
||||
}
|
||||
delete config.appender;
|
||||
|
@ -136,6 +136,7 @@ function configureAppenders(appenderList) {
|
||||
clearAppenders();
|
||||
if (appenderList) {
|
||||
appenderList.forEach(function(appenderConfig) {
|
||||
loadAppender(appenderConfig.type);
|
||||
var appender;
|
||||
appenderConfig.makers = appenderMakers;
|
||||
appender = appenderMakers[appenderConfig.type](appenderConfig);
|
||||
@ -347,15 +348,10 @@ function replaceConsole(logger) {
|
||||
});
|
||||
}
|
||||
|
||||
function loadAppenders() {
|
||||
var appenderList = fs.readdirSync(__dirname + '/appenders');
|
||||
appenderList.forEach(function(file) {
|
||||
if (/\.js$/.test(file)) {
|
||||
var appenderModule = require('./appenders/' + file);
|
||||
function loadAppender(appender) {
|
||||
var appenderModule = require('./appenders/' + appender);
|
||||
module.exports.appenders[appenderModule.name] = appenderModule.appender;
|
||||
appenderMakers[appenderModule.name] = appenderModule.configure;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
@ -363,6 +359,7 @@ module.exports = {
|
||||
getDefaultLogger: getDefaultLogger,
|
||||
|
||||
addAppender: addAppender,
|
||||
loadAppender: loadAppender,
|
||||
clearAppenders: clearAppenders,
|
||||
configure: configure,
|
||||
|
||||
@ -375,7 +372,11 @@ module.exports = {
|
||||
connectLogger: require('./connect-logger').connectLogger
|
||||
};
|
||||
|
||||
loadAppenders();
|
||||
//load the old-style appenders
|
||||
[ 'console', 'file', 'logLevelFilter' ].forEach(function(appender) {
|
||||
loadAppender(appender);
|
||||
});
|
||||
|
||||
//set ourselves up if we can find a default log4js.json
|
||||
configure(findConfiguration());
|
||||
//replace console.log, etc with log4js versions
|
||||
|
@ -22,10 +22,10 @@
|
||||
"lib": "lib"
|
||||
},
|
||||
"dependencies": {
|
||||
"hook.io": "0.7.7"
|
||||
},
|
||||
"devDependencies": {
|
||||
"vows": ">=0.5.2",
|
||||
"sandboxed-module": ">= 0.1.1"
|
||||
"sandboxed-module": ">= 0.1.1",
|
||||
"hook.io": "0.7.7"
|
||||
}
|
||||
}
|
||||
|
@ -4,13 +4,18 @@ var sandbox = require('sandboxed-module');
|
||||
|
||||
function fancyResultingHookioAppender(opts) {
|
||||
var result = { ons: {}, emissions: {}, logged: [] };
|
||||
|
||||
var fakeLog4Js = {
|
||||
appenderMakers: { file: function (config) {
|
||||
appenderMakers: {}
|
||||
};
|
||||
fakeLog4Js.loadAppender = function (appender) {
|
||||
fakeLog4Js.appenderMakers[appender] = function (config) {
|
||||
return function log(logEvent) {
|
||||
result.logged.push(logEvent);
|
||||
}
|
||||
}}
|
||||
};
|
||||
};
|
||||
|
||||
var fakeHookIo = { Hook: function() { } };
|
||||
fakeHookIo.Hook.prototype.start = function () {
|
||||
result.startCalled = true;
|
||||
@ -30,6 +35,7 @@ function fancyResultingHookioAppender(opts) {
|
||||
result.ons[on].functionToExec(data);
|
||||
}
|
||||
};
|
||||
|
||||
return { theResult: result,
|
||||
theModule: sandbox.require('../lib/appenders/hookio', {
|
||||
requires: {
|
||||
|
@ -69,7 +69,7 @@ vows.describe('log4js').addBatch({
|
||||
, log4js = sandbox.require(
|
||||
'../lib/log4js'
|
||||
, { requires:
|
||||
{ './appenders/file.js':
|
||||
{ './appenders/file':
|
||||
{
|
||||
name: "file"
|
||||
, appender: function() {}
|
||||
@ -123,10 +123,10 @@ vows.describe('log4js').addBatch({
|
||||
});
|
||||
},
|
||||
readdirSync: function() {
|
||||
return ['file.js'];
|
||||
return ['file'];
|
||||
}
|
||||
}
|
||||
, './appenders/file.js':
|
||||
, './appenders/file':
|
||||
{
|
||||
name: "file"
|
||||
, appender: function() {}
|
||||
@ -168,7 +168,7 @@ vows.describe('log4js').addBatch({
|
||||
'../lib/log4js'
|
||||
, {
|
||||
requires: {
|
||||
'./appenders/console.js': fakeConsoleAppender
|
||||
'./appenders/console': fakeConsoleAppender
|
||||
}
|
||||
}
|
||||
);
|
||||
@ -303,7 +303,7 @@ vows.describe('log4js').addBatch({
|
||||
{
|
||||
requires: {
|
||||
'fs': fakeFS
|
||||
, './appenders/console.js': fakeConsole
|
||||
, './appenders/console': fakeConsole
|
||||
}
|
||||
}
|
||||
);
|
||||
@ -434,7 +434,7 @@ vows.describe('log4js').addBatch({
|
||||
{
|
||||
requires: {
|
||||
'fs': fakeFS,
|
||||
'./appenders/console.js': fakeConsole
|
||||
'./appenders/console': fakeConsole
|
||||
},
|
||||
globals: {
|
||||
'console': fakeConsole,
|
||||
@ -511,7 +511,7 @@ vows.describe('log4js').addBatch({
|
||||
{
|
||||
requires: {
|
||||
'fs': fakeFS,
|
||||
'./appenders/console.js': fakeConsole
|
||||
'./appenders/console': fakeConsole
|
||||
},
|
||||
globals: {
|
||||
'console': fakeConsole,
|
||||
|
Loading…
Reference in New Issue
Block a user