From 87c6cfa6561ce158f7c564b66cbab68515445ee4 Mon Sep 17 00:00:00 2001 From: Tomas Bures Date: Sun, 2 Aug 2020 15:19:24 +0200 Subject: [PATCH] Fixes - Mailtrain would not start if built-in ZoneMTA had to retry the startup - Campaign list showed "Sending" instead of "Scheduled" for scheduled campaigns --- client/src/campaigns/List.js | 2 +- server/lib/builtin-zone-mta.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/campaigns/List.js b/client/src/campaigns/List.js index cf1d5ddf..aecafbf4 100644 --- a/client/src/campaigns/List.js +++ b/client/src/campaigns/List.js @@ -73,7 +73,7 @@ export default class List extends Component { title: t('status'), render: (data, display, rowData) => { if (data === CampaignStatus.SCHEDULED) { - const scheduled = rowData[6]; + const scheduled = rowData[7]; if (scheduled && new Date(scheduled) > new Date()) { return t('sendingScheduled'); } else { diff --git a/server/lib/builtin-zone-mta.js b/server/lib/builtin-zone-mta.js index e867792b..5b3b707c 100644 --- a/server/lib/builtin-zone-mta.js +++ b/server/lib/builtin-zone-mta.js @@ -184,7 +184,7 @@ function restart(callback) { restartBackoffIdx += 1; } - setTimeout(restart, backoffTimeout); + setTimeout(restart, backoffTimeout, callback); }); }