nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-comment

Browse source 
Conflicts:
	include/ostatus.php
This commit is contained in:
Michael Vogel 2015-12-22 11:25:37 +01:00
commit 307beb47fd
57 changed files with 13448 additions and 11711 deletions
Download patch file Download diff file Expand all files Collapse all files

9
include/delivery.php
View file

@ -59,10 +59,11 @@ function delivery_run(&$argv, &$argc){
$maxsysload = intval(get_config('system','maxloadavg'));
if($maxsysload < 1)
$maxsysload = 50;
if(function_exists('sys_getloadavg')) {
$load = sys_getloadavg();
if(intval($load[0]) > $maxsysload) {
logger('system: load ' . $load[0] . ' too high. Delivery deferred to next queue run.');
$load = current_load();
if($load) {
if(intval($load) > $maxsysload) {
logger('system: load ' . $load . ' too high. Delivery deferred to next queue run.');
return;
}
}