From: Wilfried Goesgens <dothebart@citadel.org>
Date: Tue, 5 Jun 2012 18:53:34 +0000 (+0200)
Subject: SMTP-Client: Remove concurrency check; its done in do_housekeeping()
X-Git-Tag: v8.12~29^2~1
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=6a4bea3fc0749145f3fc2fad514a5c4301f9d718

SMTP-Client: Remove concurrency check; its done in do_housekeeping()
---

diff --git a/citadel/modules/smtp/serv_smtpqueue.c b/citadel/modules/smtp/serv_smtpqueue.c
index 2f7c3a590..b874d1268 100644
--- a/citadel/modules/smtp/serv_smtpqueue.c
+++ b/citadel/modules/smtp/serv_smtpqueue.c
@@ -1003,14 +1003,9 @@ void smtp_do_procmsg(long msgnum, void *userdata) {
  * Run through the queue sending out messages.
  */
 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);
 	SMTPCM_syslog(LOG_INFO, "processing outbound queue");
 
@@ -1030,8 +1025,6 @@ void smtp_do_queue(void) {
 		     "queue run completed; %d messages processed %d activated",
 		     num_processed, num_activated);
 
-	run_queue_now = 0;
-	is_running = 0;
 }