friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Move the process check at the beginning of the script

This commit is contained in:
Michael Vogel 2015-12-06 16:40:31 +01:00
parent 54085508e5
commit 9f8da37c99
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/poller.php
View File

@ -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))