From: Art Cancro <ajc@citadel.org>
Date: Sun, 19 Mar 2023 01:06:40 +0000 (-0400)
Subject: Changed the algorithm for quick queue runs to prevent weirdness
X-Git-Tag: v976~70
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=cc7fcdfee5b6901c286683f5b33c3859393dd7bb;p=citadel.git

Changed the algorithm for quick queue runs to prevent weirdness
---

diff --git a/citadel/server/modules/smtp/serv_smtpclient.c b/citadel/server/modules/smtp/serv_smtpclient.c
index 12c11098a..9a91dc164 100644
--- a/citadel/server/modules/smtp/serv_smtpclient.c
+++ b/citadel/server/modules/smtp/serv_smtpclient.c
@@ -518,7 +518,10 @@ void smtp_do_queue(int type_of_queue_run) {
 	doing_smtpclient = 1;
 	end_critical_section(S_SMTPQUEUE);
 
-	syslog(LOG_DEBUG, "smtpclient: start queue run , last_queue_job_processed=%ld , last_queue_job_submitted=%ld", last_queue_job_processed, last_queue_job_submitted);
+	syslog(LOG_DEBUG, "smtpclient: start %s queue run , last_queue_job_processed=%ld , last_queue_job_submitted=%ld",
+		(type_of_queue_run == QUICK_QUEUE_RUN ? "quick" : "full"),
+		last_queue_job_processed, last_queue_job_submitted
+	);
 
 	if (CtdlGetRoom(&CC->room, SMTP_SPOOLOUT_ROOM) != 0) {
 		syslog(LOG_WARNING, "smtpclient: cannot find room <%s>", SMTP_SPOOLOUT_ROOM);
@@ -546,16 +549,20 @@ void smtp_do_queue(int type_of_queue_run) {
 	);
 
 	// We are ready to run through the queue now.
+	syslog(LOG_DEBUG, "smtpclient: %d messages to be processed", array_len(smtp_queue));
 	for (i = 0; i < array_len(smtp_queue); ++i) {
 		long m;
 		memcpy(&m, array_get_element_at(smtp_queue, i), sizeof(long));
 		smtp_process_one_msg(m);
-		last_queue_job_processed = m;
 	}
 
 	array_free(smtp_queue);
+	last_queue_job_processed = last_queue_job_submitted;
 	doing_smtpclient = 0;
-	syslog(LOG_DEBUG, "smtpclient: end queue run , last_queue_job_processed=%ld , last_queue_job_submitted=%ld", last_queue_job_processed, last_queue_job_submitted);
+	syslog(LOG_DEBUG, "smtpclient: end %s queue run , last_queue_job_processed=%ld , last_queue_job_submitted=%ld",
+		(type_of_queue_run == QUICK_QUEUE_RUN ? "quick" : "full"),
+		last_queue_job_processed, last_queue_job_submitted
+	);
 }