X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fserv_smtpqueue.c;h=a3626c8a7323b19ac558714284fca4c345737222;hb=b5d9a5debc8a174d269a5bb5d2e63df836ef397a;hp=92bc9d625d0826398c0dab5636f7395f3cfa37d8;hpb=1ceeac0374b9fb7747797c6643f3c6835b600760;p=citadel.git

diff --git a/citadel/modules/smtp/serv_smtpqueue.c b/citadel/modules/smtp/serv_smtpqueue.c
index 92bc9d625..a3626c8a7 100644
--- 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"
 
 
@@ -926,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,
@@ -997,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,
@@ -1015,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;