mexon/friendica
1
0
Fork 0
Code Pull requests Activity

allow zero delivery interval on dedicated servers

Browse source
This commit is contained in:
Friendika 2011-08-29 00:59:44 -07:00
parent 391330d95f
commit 177e0e15d7
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/notifier.php
View file

@ -384,9 +384,7 @@ function notifier_run($argv, $argc){
require_once('include/salmon.php'); require_once('include/salmon.php');
$interval = intval(get_config('system','delivery_interval')); $interval = ((get_config('system','delivery_interval') === false) ? 2 : intval(get_config('system','delivery_interval')));
if(! $interval)
$interval = 2;
// delivery loop // delivery loop
@ -411,7 +409,8 @@ function notifier_run($argv, $argc){
if((! $mail) && (! $fsuggest) && (! $followup)) { if((! $mail) && (! $fsuggest) && (! $followup)) {
proc_run('php','include/delivery.php',$cmd,$item_id,$contact['id']); proc_run('php','include/delivery.php',$cmd,$item_id,$contact['id']);
@time_sleep_until(microtime(true) + (float) $interval); if($interval)
@time_sleep_until(microtime(true) + (float) $interval);
} }
$deliver_status = 0; $deliver_status = 0;
@ -661,7 +660,8 @@ function notifier_run($argv, $argc){
if((! $mail) && (! $fsuggest) && (! $followup)) { if((! $mail) && (! $fsuggest) && (! $followup)) {
logger('notifier: delivery agent: ' . $rr['name'] . ' ' . $rr['id']); logger('notifier: delivery agent: ' . $rr['name'] . ' ' . $rr['id']);
proc_run('php','include/delivery.php',$cmd,$item_id,$rr['id']); proc_run('php','include/delivery.php',$cmd,$item_id,$rr['id']);
@time_sleep_until(microtime(true) + (float) $interval); if($interval)
@time_sleep_until(microtime(true) + (float) $interval);
} }
} }
} }

7
include/queue.php
View file

@ -38,16 +38,15 @@ function queue_run($argv, $argc){
logger('queue: start'); logger('queue: start');
$interval = intval(get_config('system','delivery_interval')); $interval = ((get_config('system','delivery_interval') === false) ? 2 : intval(get_config('system','delivery_interval')));
if(! $interval)
$interval = 2;
$r = q("select * from deliverq where 1"); $r = q("select * from deliverq where 1");
if(count($r)) { if(count($r)) {
foreach($r as $rr) { foreach($r as $rr) {
logger('queue: deliverq'); logger('queue: deliverq');
proc_run('php','include/delivery.php',$rr['cmd'],$rr['item'],$rr['contact']); proc_run('php','include/delivery.php',$rr['cmd'],$rr['item'],$rr['contact']);
@time_sleep_until(microtime(true) + (float) $interval); if($interval)
@time_sleep_until(microtime(true) + (float) $interval);
} }
} }