getmx() now uses our array class

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

diff --git a/citadel/modules/smtp/serv_smtpclient.c b/citadel/modules/smtp/serv_smtpclient.c
index e31581fa1938e8978f840f523763ba732781cf30..8e87ce4c2f4da626569a4842c602db51aaf7af51 100644 (file)
--- a/citadel/modules/smtp/serv_smtpclient.c
+++ b/citadel/modules/smtp/serv_smtpclient.c
@@ -300,7 +300,7 @@ int smtp_attempt_delivery(long msgid, char *recp, char *envelope_from, char *res
                                 try_this_mx, CtdlGetConfigStr("c_fqdn")
                            );
                        curl_easy_setopt(curl, CURLOPT_URL, smtp_url);
-                       syslog(LOG_DEBUG, "smtpclient: trying mx %d of %d <%s>", i, num_mx, smtp_url);  // send the message
+                       syslog(LOG_DEBUG, "smtpclient: trying MX %d of %d <%s>", i+1, num_mx, smtp_url);        // send the message
                        res = curl_easy_perform(curl);
                        curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response_code);
                        syslog(LOG_DEBUG,
@@ -399,7 +399,7 @@ void smtp_process_one_msg(long qmsgnum) {
        }
 
        if (should_try_now) {
-               syslog(LOG_DEBUG, "smtpclient: %ld attempting delivery now", qmsgnum);
+               syslog(LOG_DEBUG, "smtpclient: attempting delivery of message <%ld> now", qmsgnum);
                StrBuf *NewInstr = NewStrBuf();
                StrBufAppendPrintf(NewInstr, "Content-type: " SPOOLMIME "\n\n");
                StrBufAppendPrintf(NewInstr, "msgid|%ld\n", msgid);
@@ -561,7 +561,7 @@ CTDL_MODULE_INIT(smtpclient)
 {
        if (!threading) {
                CtdlRegisterMessageHook(smtp_aftersave, EVT_AFTERSAVE);
-               CtdlRegisterSessionHook(smtp_do_queue, EVT_TIMER, PRIO_AGGR + 50);
+               CtdlRegisterSessionHook(smtp_do_queue, EVT_TIMER, PRIO_AGGR + 51);
                smtp_init_spoolout();
        }