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.

1 files changed, 17 insertions, 0 deletions

diff --git a/include/zot.php b/include/zot.php
index bb87a234c..5764bb99a 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -3148,6 +3148,15 @@ function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) {
 			'msg'        => json_encode($info)
 		));
 
+
+		$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;
+		}
+
+
 		Zotlabs\Daemon\Master::Summon(array('Deliver', $hash));
 		$total = $total - 1;
 
@@ -3915,6 +3924,14 @@ function zot_reply_message_request($data) {
 				'msg'        => $data_packet
 			));
 
+
+			$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;
+			}
+
 			/*
 			 * invoke delivery to send out the notify packet
 			 */