Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deliveries array for testing purpose #38

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Deliveries array for testing purpose #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d67bddd
If test is truthy, message will be added to the deliveries export for…
Aug 4, 2011
112c4a9
Merge test changes to version 0.6.6 head (Pull Request #38)
Aug 17, 2011
40a936c
Force nodemailer to 0.1.x for short-term fix. Long term fix is upgra…
Aug 17, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions lib/node_mailer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ var EmailMessage = require("nodemailer").EmailMessage;
var fs = require('fs');
var mustache = require('../vendor/mustache');
var _templateCache = {};
var deliveries = exports.deliveries = [];

function SMTPClientPool() {
this.servers = {};
Expand Down Expand Up @@ -68,8 +69,16 @@ SMTPClientPool.prototype.send = function send(message, callback) {
delete hostClients[options.user];
client.close();})
}
client.sendMail(message,callback);
client.on('error', callback);
if(message.SERVER.test) {
deliveries.push(message);
if(message.debug) {
console.log("Node mailer added message: " + require('sys').inspect(message));
}
}
else {
client.sendMail(message,callback);
client.on('error', callback);
}
}

function merge(x,y) {
Expand All @@ -94,7 +103,8 @@ exports.send = function node_mail(message, callback) {
ssl: message.ssl,
user: message.username && message.username.toString(),
pass: message.password && message.password.toString(),
debug: true
test: message.test,
debug: message.debug
};
if(message.username || message.password) {
pool.addClient(server.port, server.host, server);
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"url": "http://github.com/Marak/node_mailer.git"
},
"dependencies": {
"nodemailer": ">= 0.1.10",
"nodemailer": "0.1.x",
"colors": ">= 0.3.0"
},
"engine": [ "node >=0.3.0" ],
Expand Down