harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

If a contact has had delivery issues in the last 15 minutes, send new posts straight to the queue

Browse Source 
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.
This commit is contained in:
friendica
2012-05-07 15:54:49 -07:00
parent e8b9b8a403
commit 189a31e628
6 changed files with 295 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/delivery.php
View File

@@ -347,7 +347,10 @@ function delivery_run($argv, $argc){
}
}
$deliver_status = dfrn_deliver($owner,$contact,$atom);
if(! was_recently_delayed($contact['id']))
$deliver_status = dfrn_deliver($owner,$contact,$atom);
else
$deliver_status = (-1);
logger('notifier: dfrn_delivery returns ' . $deliver_status);
@@ -390,7 +393,11 @@ function delivery_run($argv, $argc){
logger('notifier: slapdelivery: ' . $contact['name']);
foreach($slaps as $slappy) {
if($contact['notify']) {
$deliver_status = slapper($owner,$contact['notify'],$slappy);
if(! was_recently_delayed($contact['id']))
$deliver_status = slapper($owner,$contact['notify'],$slappy);
else
$deliver_status = (-1);
if($deliver_status == (-1)) {
// queue message for redelivery
add_to_queue($contact['id'],NETWORK_OSTATUS,$slappy);