New page setting for the maximum frontend load value.

diff --git a/index.php b/index.php
index 31af8868d7e0d17bd547e6f5b80fd27342e14b90..02316e1e952b4362a627356f6d71525884168e2a 100644 (file)
--- a/index.php
+++ b/index.php
@@ -53,12 +53,12 @@ if(!$install) {
        load_config('config');
        load_config('system');
 
-       $maxsysload = intval(get_config('system','maxloadavg'));
-       if($maxsysload < 1)
-               $maxsysload = 50;
+       $maxsysload_frontend = intval(get_config('system','maxloadavg_frontend'));
+       if($maxsysload_frontend < 1)
+               $maxsysload_frontend = 50;
        if(function_exists('sys_getloadavg')) {
                $load = sys_getloadavg();
-               if(intval($load[0]) > $maxsysload) {
+               if(intval($load[0]) > $maxsysload_frontend) {
                        logger('system: load ' . $load[0] . ' too high. Service Temporarily Unavailable.');
                        header($_SERVER["SERVER_PROTOCOL"].' 503 Service Temporarily Unavailable');
                        header('Retry-After: 300');

diff --git a/mod/admin.php b/mod/admin.php
index 0aa90237380980d474f99f3f2b761db5df52988e..43834064760eb2529521a09535f6f6ac8cdf64c7 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -357,6 +357,7 @@ function admin_page_site_post(&$a){
        $delivery_interval      =       ((x($_POST,'delivery_interval'))        ? intval(trim($_POST['delivery_interval']))     : 0);
        $poll_interval          =       ((x($_POST,'poll_interval'))            ? intval(trim($_POST['poll_interval']))         : 0);
        $maxloadavg             =       ((x($_POST,'maxloadavg'))               ? intval(trim($_POST['maxloadavg']))            : 50);
+       $maxloadavg_frontend    =       ((x($_POST,'maxloadavg_frontend'))      ? intval(trim($_POST['maxloadavg_frontend']))   : 50);
        $dfrn_only              =       ((x($_POST,'dfrn_only'))                ? True                                          : False);
        $ostatus_disabled       =       !((x($_POST,'ostatus_disabled'))        ? True                                          : False);
        $ostatus_poll_interval  =       ((x($_POST,'ostatus_poll_interval'))    ? intval(trim($_POST['ostatus_poll_interval'])) :  0);
@@ -423,6 +424,7 @@ function admin_page_site_post(&$a){
        set_config('system','delivery_interval',$delivery_interval);
        set_config('system','poll_interval',$poll_interval);
        set_config('system','maxloadavg',$maxloadavg);
+       set_config('system','maxloadavg_frontend',$maxloadavg_frontend);
        set_config('config','sitename',$sitename);
        set_config('config','hostname',$hostname);
        set_config('config','sender_email', $sender_email);
@@ -677,6 +679,7 @@ function admin_page_site(&$a) {
                '$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.")),
                '$poll_interval'        => array('poll_interval', t("Poll interval"), (x(get_config('system','poll_interval'))?get_config('system','poll_interval'):2), t("Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval.")),
                '$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.")),
+               '$maxloadavg_frontend'  => array('maxloadavg_frontend', t("Maximum Load Average (Frontend)"), ((intval(get_config('system','maxloadavg_frontend')) > 0)?get_config('system','maxloadavg_frontend'):50), t("Maximum system load before the frontend quits service - default 50.")),
 
                '$use_fulltext_engine'  => array('use_fulltext_engine', t("Use MySQL full text engine"), get_config('system','use_fulltext_engine'), t("Activates the full text engine. Speeds up search - but can only search for four and more characters.")),
                '$suppress_language'    => array('suppress_language', t("Suppress Language"), get_config('system','suppress_language'), t("Suppress language information in meta information about a posting.")),

diff --git a/view/templates/admin_site.tpl b/view/templates/admin_site.tpl
index 6880f0fd916505c1a4343c7d8c021abb608af974..bcaed585c21216434d6bda92c22b50e3f8cd2cb7 100644 (file)
--- a/view/templates/admin_site.tpl
+++ b/view/templates/admin_site.tpl
@@ -107,6 +107,7 @@
        {{include file="field_input.tpl" field=$delivery_interval}}
        {{include file="field_input.tpl" field=$poll_interval}}
        {{include file="field_input.tpl" field=$maxloadavg}}
+       {{include file="field_input.tpl" field=$maxloadavg_frontend}}
        {{include file="field_input.tpl" field=$abandon_days}}
        {{include file="field_input.tpl" field=$lockpath}}
        {{include file="field_input.tpl" field=$temppath}}