strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

don't attempt to deliver queued items to sites which have already timed out

Browse source
This commit is contained in:
Friendika 2010-11-25 23:42:03 -08:00
parent 1f69e12e1e
commit e15b1a8755
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
include/queue.php
View file

@ -33,6 +33,8 @@ function remove_queue_item($id) {
$a->set_baseurl(get_config('system','url')); $a->set_baseurl(get_config('system','url'));
$deadguys = array();
logger('queue: start'); logger('queue: start');
$r = q("SELECT `queue`.*, `contact`.`name`, `contact`.`uid` FROM `queue` $r = q("SELECT `queue`.*, `contact`.`name`, `contact`.`uid` FROM `queue`
@ -69,6 +71,12 @@ function remove_queue_item($id) {
remove_queue_item($q_item['id']); remove_queue_item($q_item['id']);
continue; continue;
} }
if(in_array($c[0]['notify'],$deadguys)) {
logger('queue: skipping known dead url: ' . $c[0]['notify']);
update_queue_time($q_item['id']);
continue;
}
$u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", $u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
intval($c[0]['uid']) intval($c[0]['uid'])
); );
@ -88,11 +96,13 @@ function remove_queue_item($id) {
logger('queue: dfrndelivery: item ' . $q_item['id'] . ' for ' . $contact['name']); logger('queue: dfrndelivery: item ' . $q_item['id'] . ' for ' . $contact['name']);
$deliver_status = dfrn_deliver($owner,$contact,$data); $deliver_status = dfrn_deliver($owner,$contact,$data);
if($deliver_status == (-1)) if($deliver_status == (-1)) {
update_queue_time($q_item['id']); update_queue_time($q_item['id']);
else $deadguys[] = $contact['notify'];
}
else {
remove_queue_item($q_item['id']); remove_queue_item($q_item['id']);
}
break; break;
default: default:
if($contact['notify']) { if($contact['notify']) {