v1.10.0

lib/caches.js

@@ -0,0 +1,28 @@
+'use strict';
+
+let cache = module.exports.cache = new Map();
+
+module.exports.push = (name, value) => {
+    if (!cache.has(name)) {
+        cache.set(name, []);
+    } else if (!Array.isArray(cache.get(name))) {
+        cache.set(name, [].concat(cache.get(name) || []));
+    }
+    cache.get(name).push(value);
+};
+
+module.exports.shift = name => {
+    if (!cache.has(name)) {
+        return false;
+    }
+    if (!Array.isArray(cache.get(name))) {
+        let value = cache.get(name);
+        cache.delete(name);
+        return value;
+    }
+    let value = cache.get(name).shift();
+    if (!cache.get(name).length) {
+        cache.delete(name);
+    }
+    return value;
+};

lib/models/campaigns.js

@@ -11,6 +11,7 @@ let isUrl = require('is-url');
 let feed = require('../feed');
 let log = require('npmlog');
 let mailer = require('../mailer');
+let caches = require('../caches');
 
 let allowedKeys = ['description', 'from', 'address', 'subject', 'template', 'source_url', 'list', 'segment', 'html', 'text'];
 
@@ -809,6 +810,7 @@ module.exports.pause = (id, callback) => {
                     connection.release();
                     return callback(err);
                 }
+                caches.cache.delete('sender queue');
                 return callback(null, true);
             });
         });
@@ -821,7 +823,7 @@ module.exports.reset = (id, callback) => {
             return callback(err);
         }
 
-        if (campaign.status !== 3 && !(campaign.status === 2 && campaign.scheduled > new Date())) {
+        if (campaign.status !== 3 && campaign.status !== 4 && !(campaign.status === 2 && campaign.scheduled > new Date())) {
             return callback(null, false);
         }
 
@@ -835,6 +837,8 @@ module.exports.reset = (id, callback) => {
                     connection.release();
                     return callback(err);
                 }
+
+                caches.cache.delete('sender queue');
                 connection.query('DELETE FROM links WHERE campaign=?', [id], err => {
                     if (err) {
                         connection.release();