Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-27 14:30:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop

Browse source
This commit is contained in:
Roland Haeder 2016-03-12 18:50:14 +01:00
commit c60605ce0c
No known key found for this signature in database
GPG key ID: B72F8185C6C7BD78
50 changed files with 2266 additions and 1619 deletions
Download patch file Download diff file Expand all files Collapse all files

13
include/poller.php
View file

@ -29,17 +29,8 @@ function poller_run(&$argv, &$argc){
if (poller_max_connections_reached())
return;
$load = current_load();
if($load) {
$maxsysload = intval(get_config('system','maxloadavg'));
if($maxsysload < 1)
$maxsysload = 50;
if(intval($load) > $maxsysload) {
logger('system: load ' . $load . ' too high. poller deferred to next scheduled run.');
return;
}
}
if (App::maxload_reached())
return;
// Checking the number of workers
if (poller_too_much_workers(1)) {