aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-05-03 21:50:48 -0700
committerfriendica <info@friendica.com>2012-05-03 21:50:48 -0700
commit421acee65b846947c24257f256c900d4881256da (patch)
tree51501745f8456cddb70a8a708480c41b6543fb7e /mod
parent15542a8690701b403ed7e7bf56d82d1511cfbd63 (diff)
downloadvolse-hubzilla-421acee65b846947c24257f256c900d4881256da.tar.gz
volse-hubzilla-421acee65b846947c24257f256c900d4881256da.tar.bz2
volse-hubzilla-421acee65b846947c24257f256c900d4881256da.zip
implement max load average before queuing/deferring delivery and poller processes
Diffstat (limited to 'mod')
-rw-r--r--mod/admin.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/mod/admin.php b/mod/admin.php
index b07ef851a..cfe5a2dd2 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -243,6 +243,7 @@ function admin_page_site_post(&$a){
$proxy = ((x($_POST,'proxy')) ? notags(trim($_POST['proxy'])) : '');
$timeout = ((x($_POST,'timeout')) ? intval(trim($_POST['timeout'])) : 60);
$delivery_interval = ((x($_POST,'delivery_interval'))? intval(trim($_POST['delivery_interval'])) : 0);
+ $maxloadavg = ((x($_POST,'maxloadavg')) ? intval(trim($_POST['maxloadavg'])) : 50);
$dfrn_only = ((x($_POST,'dfrn_only')) ? True : False);
$ostatus_disabled = !((x($_POST,'ostatus_disabled')) ? True : False);
$diaspora_enabled = ((x($_POST,'diaspora_enabled')) ? True : False);
@@ -290,6 +291,7 @@ function admin_page_site_post(&$a){
}
set_config('system','ssl_policy',$ssl_policy);
set_config('system','delivery_interval',$delivery_interval);
+ set_config('system','maxloadavg',$maxloadavg);
set_config('config','sitename',$sitename);
if ($banner==""){
// don't know why, but del_config doesn't work...
@@ -434,7 +436,7 @@ function admin_page_site(&$a) {
'$proxy' => array('proxy', t("Proxy URL"), get_config('system','proxy'), ""),
'$timeout' => array('timeout', t("Network timeout"), (x(get_config('system','curl_timeout'))?get_config('system','curl_timeout'):60), t("Value is in seconds. Set to 0 for unlimited (not recommended).")),
'$delivery_interval' => array('delivery_interval', t("Delivery interval"), (x(get_config('system','delivery_interval'))?get_config('system','delivery_interval'):2), t("Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers.")),
-
+ '$maxloadavg' => array('maxloadavg', t("Maximum Load Average"), ((intval(get_config('system','maxloadavg')) > 0)?get_config('system','maxloadavg'):50), t("Maximum system load before delivery and poll processes are deferred - default 50.")),
'$form_security_token' => get_form_security_token("admin_site"),
));