aboutsummaryrefslogtreecommitdiffstats
path: root/include
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
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')
-rw-r--r--include/network.php11
-rw-r--r--include/queue_fn.php8
-rw-r--r--include/zot.php17
3 files changed, 28 insertions, 8 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 );
diff --git a/include/queue_fn.php b/include/queue_fn.php
index c09033d0a..0d98e1e21 100644
--- a/include/queue_fn.php
+++ b/include/queue_fn.php
@@ -158,14 +158,6 @@ function queue_deliver($outq, $immediate = false) {
}
}
- if($immediate) {
- $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($outq['outq_hash']);
- return;
- }
- }
$arr = array('outq' => $outq, 'base' => $base, 'handled' => false, 'immediate' => $immediate);
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
*/