diff options
author | zotlabs <mike@macgirvin.com> | 2017-11-02 03:13:30 -0700 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2017-11-02 03:13:30 -0700 |
commit | 1b290f573acdd4f003b6ffcce6c0705ea461bd9d (patch) | |
tree | 262a1c0a418227784cfec6f9d40875edd9b9923c /Zotlabs/Daemon | |
parent | bdf50a824e6ee7f72532ba9b6e31c8730a8a497e (diff) | |
download | volse-hubzilla-1b290f573acdd4f003b6ffcce6c0705ea461bd9d.tar.gz volse-hubzilla-1b290f573acdd4f003b6ffcce6c0705ea461bd9d.tar.bz2 volse-hubzilla-1b290f573acdd4f003b6ffcce6c0705ea461bd9d.zip |
put deferred queue logic every place we create a delivery process (except for protocol 'friend requests' which aren't likely to swamp the delivery system). Remove it from the queue_delivery function which was too late to do anything.
Diffstat (limited to 'Zotlabs/Daemon')
-rw-r--r-- | Zotlabs/Daemon/Ratenotif.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Zotlabs/Daemon/Ratenotif.php b/Zotlabs/Daemon/Ratenotif.php index a94b89004..c7bf79854 100644 --- a/Zotlabs/Daemon/Ratenotif.php +++ b/Zotlabs/Daemon/Ratenotif.php @@ -88,6 +88,14 @@ class Ratenotif { 'msg' => json_encode($encoded_item) )); + + $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))) { + logger('immediate delivery deferred.', LOGGER_DEBUG, LOG_INFO); + update_queue_item($hash); + continue; + } + $deliver[] = $hash; if(count($deliver) >= $deliveries_per_process) { |