more

Changes.md

@@ -55,6 +55,7 @@
   - remove config setting ipv6_enabled #3322
   - remove undocumented use of send_email with arity of 2. #3322
   - encapsulate force_tls logic into get_force_tls #3322
+  - es6(async/promise): pre_send_trans_email_respond, process_delivery
 - queue/lmtp: refactored for DRY and improved readability #3322
 - smtp_client: pass connect_timeout, maybe fixes #3281
 - spamassassin: repackaged as NPM module #3348
@@ -63,6 +64,9 @@
 - doc(Plugins.md): update registry
 - remove last vestiges of header_hide_version (long ago renamed)
 - server.js: use the local logger methods
+  - es6(async): _graceful, get_smtp_server, setup_smtp_listeners
+  - replace async.eachLimit with Promise.all batches
+- status: replace async.map with Promise.allSettled
 - get Haraka version from utils.getVersion (which includes git id if running from repo)
 - tls_socket: remove secureConnection. Fixes #2743
   - getSocketOpts is now async

server.js

@@ -641,7 +641,6 @@ Server.init_http_respond = () => {
 
 Server.init_wss_respond = () => {
     Server.loginfo('init_wss_respond');
-    // Server.logdebug(arguments);
 }
 
 Server.get_http_docroot = () => {

test/fixtures/util_hmailitem.js

@@ -79,11 +79,7 @@ exports.createHMailItem = (outbound_context, options, callback) => {
 
     const hmails = [];
     const ok_paths = [];
-    outbound_context.exports.process_delivery(ok_paths, todo, hmails, err => {
-        if (err) {
-            callback(`process_delivery error: ${err}`);
-            return;
-        }
+    outbound_context.exports.process_delivery(ok_paths, todo, hmails).then(() => {
         if (hmails.length == 0) {
             callback('No hmail producted');
             return;
@@ -92,8 +88,10 @@ exports.createHMailItem = (outbound_context, options, callback) => {
             hmail.hostlist = [ delivery_domain ];
             callback(null, hmail);
         }
-    });
-
+    })
+    .catch(err => {
+        callback(`process_delivery error: ${err}`);
+    })
 }
 
 /**

tls_socket.js

@@ -660,7 +660,6 @@ function getCertFor (host) {
     return certsByHost['*'];  // the default TLS cert
 }
 
-
 function connect (conn_options = {}) {
     // called by outbound/client_pool, smtp_client, plugins/spamassassin,avg,clamd