From 9f8da37c99db9b66c164d4fbeb7b4e15bec19d32 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 6 Dec 2015 16:40:31 +0100 Subject: [PATCH] Move the process check at the beginning of the script --- include/poller.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/include/poller.php b/include/poller.php index 3b348531c5..06a5314a4f 100644 --- a/include/poller.php +++ b/include/poller.php @@ -38,6 +38,10 @@ function poller_run(&$argv, &$argc){ } } + // Checking the number of workers + if (poller_too_much_workers(1)) + return; + if(($argc <= 1) OR ($argv[1] != "no_cron")) { // Run the cron job that calls all other jobs proc_run("php","include/cron.php"); @@ -56,14 +60,9 @@ function poller_run(&$argv, &$argc){ // But: Update processes (like the database update) mustn't be killed } - } else { - // Checking the number of workers - if (poller_too_much_workers(1)) - return; - + } else // Sleep four seconds before checking for running processes again to avoid having too many workers sleep(4); - } // Checking number of workers if (poller_too_much_workers(2)) -- 2.39.5