increased test coverage for smtp appender

This commit is contained in:
Gareth Jones 2013-06-05 18:30:11 +10:00
parent 41ddf5eea7
commit 11fe5bde5f
2 changed files with 89 additions and 26 deletions

View File

@ -22,32 +22,31 @@ function smtpAppender(config, layout) {
var sendTimer; var sendTimer;
function sendBuffer() { function sendBuffer() {
if (logEventBuffer.length === 0) { if (logEventBuffer.length > 0) {
return;
}
var transport = mailer.createTransport(config.transport, config[config.transport]); var transport = mailer.createTransport(config.transport, config[config.transport]);
var firstEvent = logEventBuffer[0]; var firstEvent = logEventBuffer[0];
var body = ""; var body = logEventBuffer.map(layout).join('\n');
while (logEventBuffer.length > 0) { var msg = {
body += layout(logEventBuffer.shift()) + "\n"; to: config.recipients,
} subject: config.subject || subjectLayout(firstEvent),
text: body,
var msg = { headers: { "Hostname": os.hostname() }
to: config.recipients, };
subject: config.subject || subjectLayout(firstEvent),
text: body, if (config.sender) {
headers: {"Hostname": os.hostname()} msg.from = config.sender;
}; }
if (config.sender) {
msg.from = config.sender; transport.sendMail(msg, function(error, success) {
if (error) {
console.error("log4js.smtpAppender - Error happened", error);
}
transport.close();
});
logEventBuffer = [];
} }
transport.sendMail(msg, function(error, success) {
if (error) {
console.error("log4js.smtpAppender - Error happened ", error);
}
transport.close();
});
} }
function scheduleSend() { function scheduleSend() {

View File

@ -21,10 +21,31 @@ function setupLogging(category, options) {
} }
}; };
var fakeLayouts = {
layout: function(type, config) {
this.type = type;
this.config = config;
return log4js.layouts.messagePassThroughLayout;
},
basicLayout: log4js.layouts.basicLayout,
messagePassThroughLayout: log4js.layouts.messagePassThroughLayout
};
var fakeConsole = {
errors: [],
error: function(msg, value) {
this.errors.push({ msg: msg, value: value });
}
};
var smtpModule = sandbox.require('../lib/appenders/smtp', { var smtpModule = sandbox.require('../lib/appenders/smtp', {
requires: { requires: {
'nodemailer': fakeMailer 'nodemailer': fakeMailer,
} '../layouts': fakeLayouts
},
globals: {
console: fakeConsole
}
}); });
log4js.addAppender(smtpModule.configure(options), category); log4js.addAppender(smtpModule.configure(options), category);
@ -32,6 +53,8 @@ function setupLogging(category, options) {
return { return {
logger: log4js.getLogger(category), logger: log4js.getLogger(category),
mailer: fakeMailer, mailer: fakeMailer,
layouts: fakeLayouts,
console: fakeConsole,
results: msgs results: msgs
}; };
} }
@ -93,6 +116,19 @@ vows.describe('log4js smtpAppender').addBatch({
checkMessages(result, 'sender@domain.com', 'This is subject'); checkMessages(result, 'sender@domain.com', 'This is subject');
} }
}, },
'config with layout': {
topic: function() {
var setup = setupLogging('config with layout', {
layout: {
type: "tester"
}
});
return setup;
},
'should configure layout': function(result) {
assert.equal(result.layouts.type, 'tester');
}
},
'separate email for each event': { 'separate email for each event': {
topic: function() { topic: function() {
var self = this; var self = this;
@ -164,6 +200,34 @@ vows.describe('log4js smtpAppender').addBatch({
assert.equal(result.results[1].subject, 'Log event #3'); assert.equal(result.results[1].subject, 'Log event #3');
assert.ok(new RegExp('.+Log event #3\n$').test(result.results[1].text)); assert.ok(new RegExp('.+Log event #3\n$').test(result.results[1].text));
} }
},
'error when sending email': {
topic: function() {
var setup = setupLogging('error when sending email', {
recipients: 'recipient@domain.com',
sendInterval: 0,
transport: 'SMTP',
SMTP: { port: 25, auth: { user: 'user@domain.com' } }
});
setup.mailer.createTransport = function() {
return {
sendMail: function(msg, cb) {
cb({ message: "oh noes" });
},
close: function() { }
};
};
setup.logger.info("This will break");
return setup.console;
},
'should be logged to console': function(cons) {
assert.equal(cons.errors.length, 1);
assert.equal(cons.errors[0].msg, "log4js.smtpAppender - Error happened");
assert.equal(cons.errors[0].value.message, 'oh noes');
}
} }
}).export(module); }).export(module);