Merge pull request #968 from bramley/process_queue_delay

When using domain throttling, apply delay only when email was sent

Author: aulona1

public_html/lists/admin/actions/processqueue.php

@@ -1080,13 +1080,15 @@ function sendEmailTest($messageid, $email)
                     }
                     $now = time();
                     $interval = $now - ($now % DOMAIN_BATCH_PERIOD);
-                    if (!isset($domainthrottle[$throttleDomain]) || !is_array($domainthrottle[$throttleDomain])) {
+                    if (!isset($domainthrottle[$throttleDomain])
+                        || $domainthrottle[$throttleDomain]['interval'] < $interval) {
+                        // new throttle domain or a new interval for existing domain
                         $domainthrottle[$throttleDomain] = array(
-                            'interval'  => '',
+                            'interval'  => $interval,
                             'sent'      => 0,
                             'attempted' => 0,
                         );
-                    } elseif (isset($domainthrottle[$throttleDomain]['interval']) && $domainthrottle[$throttleDomain]['interval'] == $interval) {
+                    } else {
                         $throttled = $domainthrottle[$throttleDomain]['sent'] >= DOMAIN_BATCH_SIZE;
                         if ($throttled) {
                             ++$counters['send blocked by domain throttle'];
@@ -1170,17 +1172,47 @@ function sendEmailTest($messageid, $email)
                     // tried to send email , process succes / failure
                     if ($success) {
                         if (USE_DOMAIN_THROTTLE) {
-                            if ($domainthrottle[$throttleDomain]['interval'] != $interval) {
-                                $domainthrottle[$throttleDomain]['interval'] = $interval;
-                                $domainthrottle[$throttleDomain]['sent'] = 1;
-                            } else {
-                                ++$domainthrottle[$throttleDomain]['sent'];
-                            }
+                            ++$domainthrottle[$throttleDomain]['sent'];
                         }
                         ++$counters['sent'];
                         ++$counters['sent_users_for_message '.$messageid];
                         $um = Sql_Query(sprintf('replace into %s (entered,userid,messageid,status) values(now(),%d,%d,"sent")',
                             $tables['usermessage'], $userid, $messageid));
+
+                        if ($script_stage < 5) {
+                            $script_stage = 5; // we have actually sent one user
+                        }
+
+                        if (isset($running_throttle_delay)) {
+                            sleep($running_throttle_delay);
+                            if ($counters['sent'] % 5 == 0) {
+                                // retry running faster after some more messages, to see if that helps
+                                unset($running_throttle_delay);
+                            }
+                        } elseif (MAILQUEUE_THROTTLE) {
+                                usleep(MAILQUEUE_THROTTLE * 1000000);
+                        } elseif (MAILQUEUE_BATCH_SIZE && MAILQUEUE_AUTOTHROTTLE) {
+                            $totaltime = $GLOBALS['processqueue_timer']->elapsed(1);
+                            $msgperhour = (3600 / $totaltime) * $counters['sent'];
+                            $msgpersec = $msgperhour / 3600;
+
+                            //#11336 - this may cause "division by 0", but 'secpermsg' isn't used at all
+                            //  $secpermsg = $totaltime / $counters['sent'];
+                            $target = (MAILQUEUE_BATCH_PERIOD / MAILQUEUE_BATCH_SIZE) * $counters['sent'];
+                            $delay = $target - $totaltime;
+
+                            if ($delay > 0) {
+                                if (VERBOSE) {
+                                    /* processQueueOutput(s('waiting for').' '.$delay.' '.s('seconds').' '.
+                                   s('to make sure we don\'t exceed our limit of ').MAILQUEUE_BATCH_SIZE.' '.
+                                   s('messages in ').' '.MAILQUEUE_BATCH_PERIOD.s('seconds')); */
+                                    processQueueOutput(s('waiting for %.1f seconds to meet target of %s seconds per message',
+                                            $delay, (MAILQUEUE_BATCH_PERIOD / MAILQUEUE_BATCH_SIZE))
+                                    );
+                                }
+                                usleep($delay * 1000000);
+                            }
+                        }
                     } else {
                         ++$counters['failed_sent'];
                         ++$counters['failed_sent_for_message '.$messageid];
@@ -1207,40 +1239,6 @@ function sendEmailTest($messageid, $email)
                                 $GLOBALS['tables']['user'], $useremail));
                         }
                     }
-
-                    if ($script_stage < 5) {
-                        $script_stage = 5; // we have actually sent one user
-                    }
-                    if (isset($running_throttle_delay)) {
-                        sleep($running_throttle_delay);
-                        if ($counters['sent'] % 5 == 0) {
-                            // retry running faster after some more messages, to see if that helps
-                            unset($running_throttle_delay);
-                        }
-                    } elseif (MAILQUEUE_THROTTLE) {
-                        usleep(MAILQUEUE_THROTTLE * 1000000);
-                    } elseif (MAILQUEUE_BATCH_SIZE && MAILQUEUE_AUTOTHROTTLE) {
-                        $totaltime = $GLOBALS['processqueue_timer']->elapsed(1);
-                        $msgperhour = (3600 / $totaltime) * $counters['sent'];
-                        $msgpersec = $msgperhour / 3600;
-
-                        //#11336 - this may cause "division by 0", but 'secpermsg' isn't used at all
-                        //  $secpermsg = $totaltime / $counters['sent'];
-                        $target = (MAILQUEUE_BATCH_PERIOD / MAILQUEUE_BATCH_SIZE) * $counters['sent'];
-                        $delay = $target - $totaltime;
-
-                        if ($delay > 0) {
-                            if (VERBOSE) {
-                                /* processQueueOutput(s('waiting for').' '.$delay.' '.s('seconds').' '.
-                               s('to make sure we don\'t exceed our limit of ').MAILQUEUE_BATCH_SIZE.' '.
-                               s('messages in ').' '.MAILQUEUE_BATCH_PERIOD.s('seconds')); */
-                                processQueueOutput(s('waiting for %.1f seconds to meet target of %s seconds per message',
-                                        $delay, (MAILQUEUE_BATCH_PERIOD / MAILQUEUE_BATCH_SIZE))
-                                );
-                            }
-                            usleep($delay * 1000000);
-                        }
-                    }
                 } else {
                     ++$cannotsend;
                     // mark it as sent anyway, because otherwise the process will never finish