From 0d7062ffdf018287c14f09666cc0e0f82997ccca Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 2 Nov 2017 15:43:14 -0700 Subject: more queue work --- include/network.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'include/network.php') diff --git a/include/network.php b/include/network.php index 73a6aeff2..2caf29ab5 100644 --- a/include/network.php +++ b/include/network.php @@ -1433,14 +1433,19 @@ function scrape_feed($url) { -function do_delivery($deliveries) { + + +function do_delivery($deliveries, $force = false) { + + // $force is set if a site that wasn't responding suddenly returns to life. + // Try and shove through everything going to that site while it's responding. if(! (is_array($deliveries) && count($deliveries))) return; $x = q("select count(outq_hash) as total from outq where outq_delivered = 0"); - if(intval($x[0]['total']) > intval(get_config('system','force_queue_threshold',300))) { + if(intval($x[0]['total']) > intval(get_config('system','force_queue_threshold',300)) && (! $force)) { logger('immediate delivery deferred.', LOGGER_DEBUG, LOG_INFO); foreach($deliveries as $d) { update_queue_item($d); -- cgit v1.2.3