From 5ce81abfa49b1fcc83525b2ca14f393eeb98f7a7 Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Tue, 28 Feb 2012 00:44:07 +0100 Subject: [PATCH] SMTP-client: when serializing, make next now+Retry --- citadel/modules/smtp/serv_smtpqueue.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/citadel/modules/smtp/serv_smtpqueue.c b/citadel/modules/smtp/serv_smtpqueue.c index 0d1073558..b2c0ea233 100644 --- a/citadel/modules/smtp/serv_smtpqueue.c +++ b/citadel/modules/smtp/serv_smtpqueue.c @@ -341,7 +341,7 @@ StrBuf *SerializeQueueItem(OneQueItem *MyQItem) StrBufAppendBufPlain(QMessage, HKEY("\nattempted|"), 0); StrBufAppendPrintf(QMessage, "%ld", - MyQItem->ReattemptWhen); + ctdl_ev_now() + MyQItem->Retry); It = GetNewHashPos(MyQItem->MailQEntries, 0); while (GetNextHashPos(MyQItem->MailQEntries, It, &len, &Key, &vQE)) @@ -422,7 +422,10 @@ void QItem_Handle_retry(OneQueItem *Item, StrBuf *Line, const char **Pos) { Item->Retry = StrBufExtractNext_int(Line, Pos, '|'); - Item->Retry *= 2; + if (Item->Retry == 0) + Item->Retry = SMTP_RETRY_INTERVAL; + else + Item->Retry *= 2; } -- 2.30.2