aboutsummaryrefslogtreecommitdiffstats
path: root/include/network.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-11-02 12:36:05 +0100
committerMario Vavti <mario@mariovavti.com>2017-11-02 12:36:05 +0100
commit8f59b2d3e03b579d62efce9067acbcd32c5ac2b5 (patch)
tree7e713b118be1d581cd4bb2c59d8b23d4b20943ea /include/network.php
parent00d8783e45034febe06ff9e7139921a2588702db (diff)
parent1b290f573acdd4f003b6ffcce6c0705ea461bd9d (diff)
downloadvolse-hubzilla-8f59b2d3e03b579d62efce9067acbcd32c5ac2b5.tar.gz
volse-hubzilla-8f59b2d3e03b579d62efce9067acbcd32c5ac2b5.tar.bz2
volse-hubzilla-8f59b2d3e03b579d62efce9067acbcd32c5ac2b5.zip
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include/network.php')
-rw-r--r--include/network.php11
1 files changed, 11 insertions, 0 deletions
diff --git a/include/network.php b/include/network.php
index 2f29a70c4..73a6aeff2 100644
--- a/include/network.php
+++ b/include/network.php
@@ -1438,6 +1438,17 @@ function do_delivery($deliveries) {
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))) {
+ logger('immediate delivery deferred.', LOGGER_DEBUG, LOG_INFO);
+ foreach($deliveries as $d) {
+ update_queue_item($d);
+ }
+ return;
+ }
+
+
$interval = ((get_config('system','delivery_interval') !== false)
? intval(get_config('system','delivery_interval')) : 2 );