Don't use a delivery interval when using the worker

diff --git a/include/cron.php b/include/cron.php
index 712befb1fff58097394d6b04ea8970955bb0361f..0c9d6baa583f8938d72908430a16f1ff0854a1ce 100644 (file)
--- a/include/cron.php
+++ b/include/cron.php
@@ -215,6 +215,10 @@ function cron_run(&$argv, &$argc){
        if(! $interval)
                $interval = ((get_config('system','delivery_interval') === false) ? 3 : intval(get_config('system','delivery_interval')));
 
+       // If we are using the worker we don't need a delivery interval
+       if (get_config("system", "worker"))
+               $interval = false;
+
        $sql_extra = (($manual_id) ? " AND `id` = $manual_id " : "");
 
        reload_plugins();

diff --git a/include/notifier.php b/include/notifier.php
index 002b3c8d74302e0d79000ec201dc050ff6632a1e..593933b3266c4e58b1cca8167ed7ca6af41ca5f1 100644 (file)
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -615,6 +615,10 @@ function notifier_run(&$argv, &$argc){
 
        $interval = ((get_config('system','delivery_interval') === false) ? 2 : intval(get_config('system','delivery_interval')));
 
+       // If we are using the worker we don't need a delivery interval
+       if (get_config("system", "worker"))
+               $interval = false;
+
        // delivery loop
 
        if(count($r)) {

diff --git a/include/poller.php b/include/poller.php
index bdf6ba84e9991af67adc8ff6441cd7ae57f77659..053880bc5975a92f3b0f753e46e64bd636ea63c5 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -39,7 +39,7 @@ function poller_run(&$argv, &$argc){
 
        } else
                // Sleep two seconds before checking for running processes to avoid having too many workers
-               sleep(2);
+               sleep(4);
 
        // Checking number of workers
        $workers = q("SELECT COUNT(*) AS `workers` FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");

diff --git a/include/queue.php b/include/queue.php
index 3f6686ec6e1c8f09c2220ca41c78be8695768f43..cb5fe28ad9bc5e1fee4ab55fdcdb43f0b2c27ed4 100644 (file)
--- a/include/queue.php
+++ b/include/queue.php
@@ -60,6 +60,10 @@ function queue_run(&$argv, &$argc){
 
        $interval = ((get_config('system','delivery_interval') === false) ? 2 : intval(get_config('system','delivery_interval')));
 
+       // If we are using the worker we don't need a delivery interval
+       if (get_config("system", "worker"))
+               $interval = false;
+
        $r = q("select * from deliverq where 1");
        if($r) {
                foreach($r as $rr) {