diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-05-07 21:53:57 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-05-07 21:53:57 -0400 |
| commit | 34d3d455892cbad299aac8710016daffefb1c4cb (patch) | |
| tree | 3035784f65e3d4bd58a12f382d77e99b19ad323d /mod/admin.php | |
| parent | dbbcddf84527c7df95909c5dad2d03b26262efbc (diff) | |
| parent | b128a37cee7b49ae83d16ddfd3cd99097a80b9f9 (diff) | |
| download | volse-hubzilla-34d3d455892cbad299aac8710016daffefb1c4cb.tar.gz volse-hubzilla-34d3d455892cbad299aac8710016daffefb1c4cb.tar.bz2 volse-hubzilla-34d3d455892cbad299aac8710016daffefb1c4cb.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
finished dry run - now for real test
diabook-themes: state of the boxes at right_aside are now stored in db, instead of cookie.
don't throw "did not contain xml" error if it's a valid rss that doesn't have the <?xml declaration
If a contact has had delivery issues in the last 15 minutes, send new posts straight to the queue and don't even try to connect. Also defer polling for stuck contacts. Should reduce the number of stuck processes trying to connect with dead or dying servers significantly.
separate poll_interval from delivery_interval - default is the same.
* master:
Diffstat (limited to 'mod/admin.php')
| -rw-r--r-- | mod/admin.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mod/admin.php b/mod/admin.php index cfe5a2dd2..2810c8a8a 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); + $poll_interval = ((x($_POST,'poll_interval'))? intval(trim($_POST['poll_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); @@ -291,6 +292,7 @@ function admin_page_site_post(&$a){ } set_config('system','ssl_policy',$ssl_policy); set_config('system','delivery_interval',$delivery_interval); + set_config('system','poll_interval',$poll_interval); set_config('system','maxloadavg',$maxloadavg); set_config('config','sitename',$sitename); if ($banner==""){ @@ -436,6 +438,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.")), + '$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.")), '$form_security_token' => get_form_security_token("admin_site"), |