SMTP-Client: streamline logging; make look more uniq

[citadel.git] / citadel / modules / smtp / serv_smtpqueue.c

diff --git a/citadel/modules/smtp/serv_smtpqueue.c b/citadel/modules/smtp/serv_smtpqueue.c
index b2c0ea2338af6ada31000619b344bb59d3091104..a3626c8a7323b19ac558714284fca4c345737222 100644 (file)
--- a/citadel/modules/smtp/serv_smtpqueue.c
+++ b/citadel/modules/smtp/serv_smtpqueue.c
@@ -86,6 +86,7 @@
 #include "ctdl_module.h"
 
 #include "smtpqueue.h"
+#include "smtp_clienthandlers.h"
 #include "event_client.h"
 
 
@@ -101,6 +102,15 @@ static const long MaxRetry = SMTP_RETRY_INTERVAL * 2 * 2 * 2 * 2 * 2 * 2 * 2 * 2
 int MsgCount            = 0;
 int run_queue_now       = 0;   /* Set to 1 to ignore SMTP send retry times */
 
+void RegisterQItemHandler(const char *Key, long Len, QItemHandler H)
+{
+       QItemHandlerStruct *HS = (QItemHandlerStruct*)malloc(sizeof(QItemHandlerStruct));
+       HS->H = H;
+       Put(QItemHandlers, Key, Len, HS, NULL);
+}
+
+
+
 void smtp_try_one_queue_entry(OneQueItem *MyQItem,
                              MailQEntry *MyQEntry,
                              StrBuf *MsgText,
@@ -132,6 +142,22 @@ int DecreaseQReference(OneQueItem *MyQItem)
        return IDestructQueItem;
 }
 
+void DecreaseShutdownDeliveries(OneQueItem *MyQItem)
+{
+       pthread_mutex_lock(&ActiveQItemsLock);
+       MyQItem->NotYetShutdownDeliveries--;
+       pthread_mutex_unlock(&ActiveQItemsLock);
+}
+
+int GetShutdownDeliveries(OneQueItem *MyQItem)
+{
+       int DestructNow;
+
+       pthread_mutex_lock(&ActiveQItemsLock);
+       DestructNow = MyQItem->ActiveDeliveries == 0;
+       pthread_mutex_unlock(&ActiveQItemsLock);
+       return DestructNow;
+}
 void RemoveQItem(OneQueItem *MyQItem)
 {
        long len;
@@ -270,9 +296,9 @@ OneQueItem *DeserializeQueueItem(StrBuf *RawQItem, long QueMsgID)
                StrBufExtract_NextToken(Token, Line, &pItemPart, '|');
                if (GetHash(QItemHandlers, SKEY(Token), &vHandler))
                {
-                       QItemHandler H;
-                       H = (QItemHandler) vHandler;
-                       H(Item, Line, &pItemPart);
+                       QItemHandlerStruct *HS;
+                       HS = (QItemHandlerStruct*) vHandler;
+                       HS->H(Item, Line, &pItemPart);
                }
        }
        FreeStrBuf(&Line);
@@ -341,7 +367,7 @@ StrBuf *SerializeQueueItem(OneQueItem *MyQItem)
 
        StrBufAppendBufPlain(QMessage, HKEY("\nattempted|"), 0);
        StrBufAppendPrintf(QMessage, "%ld",
-                          ctdl_ev_now() + MyQItem->Retry);
+                          time(NULL) /*ctdl_ev_now()*/ + MyQItem->Retry);
 
        It = GetNewHashPos(MyQItem->MailQEntries, 0);
        while (GetNextHashPos(MyQItem->MailQEntries, It, &len, &Key, &vQE))
@@ -503,7 +529,7 @@ void smtpq_do_bounce(OneQueItem *MyQItem, StrBuf *OMsgTxt)
        if (MyQItem->SendBounceMail == 0)
                return;
 
-       now = ev_time();
+       now = time (NULL); //ev_time();
 
        if ( (now - MyQItem->Submitted) > SMTP_GIVE_UP ) {
                give_up = 1;
@@ -621,7 +647,7 @@ void smtpq_do_bounce(OneQueItem *MyQItem, StrBuf *OMsgTxt)
        }
 
        /* Attach the original message */
-       StrBufAppendBufPlain(BounceMB, HKEY("--"), 0);
+       StrBufAppendBufPlain(BounceMB, HKEY("\r\n--"), 0);
        StrBufAppendBuf(BounceMB, boundary, 0);
        StrBufAppendBufPlain(BounceMB, HKEY("\r\n"), 0);
        StrBufAppendBufPlain(BounceMB,
@@ -680,6 +706,7 @@ void smtpq_do_bounce(OneQueItem *MyQItem, StrBuf *OMsgTxt)
  * Called by smtp_do_queue() to handle an individual message.
  */
 void smtp_do_procmsg(long msgnum, void *userdata) {
+       time_t now;
        int mynumsessions = num_sessions;
        struct CtdlMessage *msg = NULL;
        char *instr = NULL;
@@ -737,11 +764,12 @@ void smtp_do_procmsg(long msgnum, void *userdata) {
        /*
         * Postpone delivery if we've already tried recently.
         */
+       now = time(NULL);
        if ((MyQItem->ReattemptWhen != 0) && 
-           (time(NULL) < MyQItem->ReattemptWhen) &&
+           (now < MyQItem->ReattemptWhen) &&
            (run_queue_now == 0))
        {
-               syslog(LOG_DEBUG, "SMTP client: Retry time not yet reached.\n");
+               syslog(LOG_DEBUG, "SMTP client: Retry time not yet reached. %ld seconds left.",  MyQItem->ReattemptWhen - now);
 
                It = GetNewHashPos(MyQItem->MailQEntries, 0);
                pthread_mutex_lock(&ActiveQItemsLock);
@@ -845,6 +873,7 @@ void smtp_do_procmsg(long msgnum, void *userdata) {
        }
        DeleteHashPos(&It);
 
+       MyQItem->NotYetShutdownDeliveries = 
        MyQItem->ActiveDeliveries = CountActiveQueueEntries(MyQItem);
 
        /* failsafe against overload: 
@@ -898,6 +927,7 @@ void smtp_do_procmsg(long msgnum, void *userdata) {
                                       ChrPtr(ThisItem->Recipient),
                                       i,
                                       m);
+                               (*((int*) userdata)) ++;
                                smtp_try_one_queue_entry(MyQItem,
                                                         ThisItem,
                                                         Msg,
@@ -969,16 +999,17 @@ void smtp_do_procmsg(long msgnum, void *userdata) {
 void smtp_do_queue(void) {
        static int is_running = 0;
        int num_processed = 0;
+       int num_activated = 0;
 
        if (is_running)
                return; /* Concurrency check - only one can run */
        is_running = 1;
 
        pthread_setspecific(MyConKey, (void *)&smtp_queue_CC);
-       syslog(LOG_INFO, "SMTP client: processing outbound queue");
+       SMTPCM_syslog(LOG_INFO, "processing outbound queue");
 
        if (CtdlGetRoom(&CC->room, SMTP_SPOOLOUT_ROOM) != 0) {
-               syslog(LOG_ERR, "Cannot find room <%s>", SMTP_SPOOLOUT_ROOM);
+               SMTPC_syslog(LOG_ERR, "Cannot find room <%s>", SMTP_SPOOLOUT_ROOM);
        }
        else {
                num_processed = CtdlForEachMessage(MSGS_ALL,
@@ -987,11 +1018,11 @@ void smtp_do_queue(void) {
                                                   SPOOLMIME,
                                                   NULL,
                                                   smtp_do_procmsg,
-                                                  NULL);
+                                                  &num_activated);
        }
-       syslog(LOG_INFO,
-              "SMTP client: queue run completed; %d messages processed",
-              num_processed);
+       SMTPC_syslog(LOG_INFO,
+                    "queue run completed; %d messages processed %d activated",
+                    num_processed, num_activated);
 
        run_queue_now = 0;
        is_running = 0;
@@ -1092,14 +1123,15 @@ CTDL_MODULE_INIT(smtp_queu)
 
                QItemHandlers = NewHash(0, NULL);
 
-               Put(QItemHandlers, HKEY("msgid"), QItem_Handle_MsgID, reference_free_handler);
-               Put(QItemHandlers, HKEY("envelope_from"), QItem_Handle_EnvelopeFrom, reference_free_handler);
-               Put(QItemHandlers, HKEY("retry"), QItem_Handle_retry, reference_free_handler);
-               Put(QItemHandlers, HKEY("attempted"), QItem_Handle_Attempted, reference_free_handler);
-               Put(QItemHandlers, HKEY("remote"), QItem_Handle_Recipient, reference_free_handler);
-               Put(QItemHandlers, HKEY("bounceto"), QItem_Handle_BounceTo, reference_free_handler);
-               Put(QItemHandlers, HKEY("source_room"), QItem_Handle_SenderRoom, reference_free_handler);
-               Put(QItemHandlers, HKEY("submitted"), QItem_Handle_Submitted, reference_free_handler);
+               RegisterQItemHandler(HKEY("msgid"),             QItem_Handle_MsgID);
+               RegisterQItemHandler(HKEY("envelope_from"),     QItem_Handle_EnvelopeFrom);
+               RegisterQItemHandler(HKEY("retry"),             QItem_Handle_retry);
+               RegisterQItemHandler(HKEY("attempted"),         QItem_Handle_Attempted);
+               RegisterQItemHandler(HKEY("remote"),            QItem_Handle_Recipient);
+               RegisterQItemHandler(HKEY("bounceto"),          QItem_Handle_BounceTo);
+               RegisterQItemHandler(HKEY("source_room"),       QItem_Handle_SenderRoom);
+               RegisterQItemHandler(HKEY("submitted"),         QItem_Handle_Submitted);
+
                smtp_init_spoolout();
 
                CtdlRegisterEVCleanupHook(smtp_evq_cleanup);