From de6c777d3f6753b8fb5f33bc0ee8acafc6772551 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 21 Nov 2010 23:00:01 -0800 Subject: infrastructure for queueing, redelivery --- include/notifier.php | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) (limited to 'include/notifier.php') diff --git a/include/notifier.php b/include/notifier.php index f22917e4f..bbc4f0047 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -255,10 +255,24 @@ case 'dfrn': logger('notifier: dfrndelivery: ' . $contact['name']); $deliver_status = dfrn_deliver($owner,$contact,$atom); + + if($deliver_status == (-1)) { + // queue message for redelivery + + } + break; default: if($followup && $contact['notify']) { - slapper($owner,$contact['notify'],$slap); + logger('notifier: slapdelivery: ' . $contact['name']); + $deliver_status = slapper($owner,$contact['notify'],$slap); + + if($deliver_status == (-1)) { + // queue message for redelivery + + } + + } else { @@ -269,7 +283,13 @@ logger('notifier: slapdelivery: ' . $contact['name']); foreach($slaps as $slappy) { if($contact['notify']) { - slapper($owner,$contact['notify'],$slappy); + $deliver_status = slapper($owner,$contact['notify'],$slappy); + if($deliver_status == (-1)) { + // queue message for redelivery + // if not already in queue + // else if deliver_status ok and queued, remove from queue + + } } } } @@ -277,6 +297,7 @@ break; } + if(($cmd === 'mail') && ($deliver_status == 0)) { $r = q("UPDATE `mail` SET `delivered` = 1 WHERE `id` = %d LIMIT 1", intval($item_id) @@ -292,7 +313,7 @@ logger('notifier: urldelivery: ' . $url); foreach($slaps as $slappy) { if($url) { - slapper($owner,$url,$slappy); + $deliver_status = slapper($owner,$url,$slappy); } } } -- cgit v1.2.3