From 3b6c631b837f18a5cf9f2be2c2af9453dec7a47f Mon Sep 17 00:00:00 2001
From: Edward Zborowski <ed@rubensteintech.com>
Date: Wed, 8 Jul 2015 21:20:29 -0400
Subject: [PATCH 1/3] Created tests for new smtp transport option

---
 test/smtpAppender-test.js | 56 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/test/smtpAppender-test.js b/test/smtpAppender-test.js
index f681c75..a46d9c6 100644
--- a/test/smtpAppender-test.js
+++ b/test/smtpAppender-test.js
@@ -222,5 +222,61 @@ vows.describe('log4js smtpAppender').addBatch({
       assert.equal(cons.errors[0].msg, "log4js.smtpAppender - Error happened");
       assert.equal(cons.errors[0].value.message, 'oh noes');
     }
+  },
+  'transport full config': {
+    topic: function() {
+      var setup = setupLogging('transport full config', {
+          recipients: 'recipient@domain.com',
+          transport: {
+              plugin: 'sendmail',
+              options: {
+                  path: '/usr/sbin/sendmail'
+              }
+          }
+      });
+      setup.logger.info('Log event #1');
+      return setup;
+    },
+    'there should be one message only': function (result) {
+      assert.equal(result.results.length, 1);
+    },
+    'message should contain proper data': function (result) {
+      checkMessages(result);
+    }
+  },
+  'transport no-options config': {
+    topic: function() {
+      var setup = setupLogging('transport no-options config', {
+          recipients: 'recipient@domain.com',
+          transport: {
+              plugin: 'sendmail'
+          }
+      });
+      setup.logger.info('Log event #1');
+      return setup;
+    },
+    'there should be one message only': function (result) {
+      assert.equal(result.results.length, 1);
+    },
+    'message should contain proper data': function (result) {
+      checkMessages(result);
+    }
+  },
+  'transport no-plugin config': {
+    topic: function() {
+      var setup = setupLogging('transport no-plugin config', {
+          recipients: 'recipient@domain.com',
+          transport: {
+          }
+      });
+      setup.logger.info('Log event #1');
+      return setup;
+    },
+    'there should be one message only': function (result) {
+      assert.equal(result.results.length, 1);
+    },
+    'message should contain proper data': function (result) {
+      checkMessages(result);
+    }
   }
 }).export(module);

From 5f3a0f293ad6254f6d0600ecefbc13e3d3626692 Mon Sep 17 00:00:00 2001
From: Edward Zborowski <ed@rubensteintech.com>
Date: Wed, 8 Jul 2015 21:41:08 -0400
Subject: [PATCH 2/3] Use a nodemailer transport plugin if transport option is
 provided

---
 lib/appenders/smtp.js | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/lib/appenders/smtp.js b/lib/appenders/smtp.js
index 1ec1a0f..e547b8a 100644
--- a/lib/appenders/smtp.js
+++ b/lib/appenders/smtp.js
@@ -30,7 +30,8 @@ function smtpAppender(config, layout) {
 	function sendBuffer() {
     if (logEventBuffer.length > 0) {
 		
-      var transport = mailer.createTransport(config.SMTP);
+      var transportOpts = getTransportOptions(config);
+      var transport = mailer.createTransport(transportOpts);
       var firstEvent = logEventBuffer[0];
       var body = "";
       var count = logEventBuffer.length;
@@ -72,6 +73,20 @@ function smtpAppender(config, layout) {
     }
 	}
 	
+	function getTransportOptions(config) {
+        var transportOpts = null;
+        if( config.SMTP ) {
+            transportOpts = config.SMTP;
+        } else if( config.transport ) {
+            var plugin = config.transport.plugin || 'smtp';
+            var transportModule = 'nodemailer-' + plugin + '-transport';
+            var transporter = require( transportModule );
+            transportOpts = transporter( config.transport.options );
+        }
+
+        return transportOpts;
+	}
+	
 	return function(loggingEvent) {
 		unsentCount++;
 		logEventBuffer.push(loggingEvent);

From 2642c89070347205b397cf019461c06b1105cedb Mon Sep 17 00:00:00 2001
From: Edward Zborowski <ed@rubensteintech.com>
Date: Wed, 8 Jul 2015 22:43:51 -0400
Subject: [PATCH 3/3] Added a extra sandbox requires to get tests passing

---
 test/smtpAppender-test.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/smtpAppender-test.js b/test/smtpAppender-test.js
index a46d9c6..5caff43 100644
--- a/test/smtpAppender-test.js
+++ b/test/smtpAppender-test.js
@@ -38,9 +38,14 @@ function setupLogging(category, options) {
     }
   };
 
+  var fakeTransportPlugin = function () {
+  };
+    
   var smtpModule = sandbox.require('../lib/appenders/smtp', {
 		requires: {
       'nodemailer': fakeMailer,
+      'nodemailer-sendmail-transport': fakeTransportPlugin,
+      'nodemailer-smtp-transport': fakeTransportPlugin,
       '../layouts': fakeLayouts
 		},
     globals: {