SMTP-Client: Remove concurrency check; its done in do_housekeeping()
authorWilfried Goesgens <dothebart@citadel.org>
Tue, 5 Jun 2012 18:53:34 +0000 (20:53 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Tue, 5 Jun 2012 18:53:34 +0000 (20:53 +0200)
citadel/modules/smtp/serv_smtpqueue.c

index 2f7c3a5905cbe2a16596f17baeaf161ed26b65e2..b874d1268452870449d405922989cb31d4a4f1b8 100644 (file)
@@ -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;
 }