separate poll_interval from delivery_interval - default is the same.

diff --git a/include/poller.php b/include/poller.php
index f6553c84606fb0750e41ad2a7af961f099038377..6b12445d195004f53d54bbc9143bf1f6dff49bb9 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -126,7 +126,9 @@ function poller_run($argv, $argc){
                $force     = true;
        }
 
-       $interval = ((get_config('system','delivery_interval') === false) ? 3 : intval(get_config('system','delivery_interval')));
+       $interval = intval(get_config('system','poll_interval'));
+       if(! $interval) 
+               $interval = ((get_config('system','delivery_interval') === false) ? 3 : intval(get_config('system','delivery_interval')));
 
        $sql_extra = (($manual_id) ? " AND `id` = $manual_id " : "");
 

diff --git a/mod/admin.php b/mod/admin.php
index cfe5a2dd2cea1d2831dda8cbb177f72befb52d3b..2810c8a8ab47c6be902d9a5f4f537ca7181955a6 100644 (file)
--- 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"),
                        

diff --git a/view/admin_site.tpl b/view/admin_site.tpl
index 265f2724df2bd97fb39a36f94a32e2582c499090..3ca03262d4f1814cbd019f02ec074b6978a8b7e9 100644 (file)
--- a/view/admin_site.tpl
+++ b/view/admin_site.tpl
@@ -81,6 +81,7 @@
        {{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }}
        {{ inc field_input.tpl with $field=$timeout }}{{ endinc }}
        {{ inc field_input.tpl with $field=$delivery_interval }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$poll_interval }}{{ endinc }}
        {{ inc field_input.tpl with $field=$maxloadavg }}{{ endinc }}
        {{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }}