This commit is contained in:
Guillaume Chauvet 2015-11-27 15:10:52 +01:00
parent fb9fee9c54
commit 9df030c32c
2 changed files with 12 additions and 12 deletions

View File

@ -35,11 +35,11 @@ function sendBuffer() {
headers: {"Hostname": os.hostname()}
};
if (true === config.attachement.enable) {
msg[config.html ? "html" : "text"] = config.attachement.message;
if (true === config.attachment.enable) {
msg[config.html ? "html" : "text"] = config.attachment.message;
msg.attachments = [
{
filename: config.attachement.filename,
filename: config.attachment.filename,
contentType: 'text/x-log',
content: body
}
@ -98,13 +98,13 @@ function scheduleSend() {
function smtpAppender(_config, _layout) {
config = _config;
if (!config.attachement) {
config.attachement = {};
if (!config.attachment) {
config.attachment = {};
}
config.attachement.enable = config.attachement && config.attachement.enable;
config.attachement.message = config.attachement && config.attachement.message || "See logs as attachement";
config.attachement.filename = config.attachement && config.attachement.filename || "default.log";
config.attachment.enable = config.attachment && config.attachment.enable;
config.attachment.message = config.attachment && config.attachment.message || "See logs as attachment";
config.attachment.filename = config.attachment && config.attachment.filename || "default.log";
layout = _layout || layouts.basicLayout;
subjectLayout = layouts.messagePassThroughLayout;
sendInterval = config.sendInterval * 1000 || 0;

View File

@ -285,11 +285,11 @@ vows.describe('log4js smtpAppender').addBatch({
checkMessages(result);
}
},
'attachement config': {
'attachment config': {
topic: function () {
var setup = setupLogging('attachement config', {
var setup = setupLogging('attachment config', {
recipients: 'recipient@domain.com',
attachement: {
attachment: {
enable: true
},
SMTP: {
@ -306,7 +306,7 @@ vows.describe('log4js smtpAppender').addBatch({
assert.equal(result.results.length, 1);
assert.equal(result.results[0].attachments.length, 1);
var attachment = result.results[0].attachments[0];
assert.equal(result.results[0].text, "See logs as attachement");
assert.equal(result.results[0].text, "See logs as attachment");
assert.equal(attachment.filename, "default.log");
assert.equal(attachment.contentType, "text/x-log");
assert.ok(new RegExp('.+Log event #' + 1 + '\n$').test(attachment.content));