aboutsummaryrefslogtreecommitdiffstats
path: root/include/queue_fn.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-11-03 19:18:35 -0700
committerzotlabs <mike@macgirvin.com>2017-11-03 19:18:35 -0700
commit1d903655afdd8e49942c6d6c9ca1a7feadeaaa82 (patch)
tree892c93a0a3e434b6e8ff8c04d3d7107cf1e12750 /include/queue_fn.php
parent0403738981487b7edec20b11a85849254366a202 (diff)
parenta899ce1c22386b9ff882048cba35d46f560ee654 (diff)
downloadvolse-hubzilla-1d903655afdd8e49942c6d6c9ca1a7feadeaaa82.tar.gz
volse-hubzilla-1d903655afdd8e49942c6d6c9ca1a7feadeaaa82.tar.bz2
volse-hubzilla-1d903655afdd8e49942c6d6c9ca1a7feadeaaa82.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'include/queue_fn.php')
-rw-r--r--include/queue_fn.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/queue_fn.php b/include/queue_fn.php
index 0d98e1e21..5fb0d5f1e 100644
--- a/include/queue_fn.php
+++ b/include/queue_fn.php
@@ -42,7 +42,7 @@ function update_queue_item($id, $add_priority = 0) {
$next = datetime_convert('UTC','UTC','now + 1 hour');
}
else {
- $next = datetime_convert('UTC','UTC','now + 15 minutes');
+ $next = datetime_convert('UTC','UTC','now + ' . intval($add_priority) . ' minutes');
}
q("UPDATE outq SET outq_updated = '%s',
@@ -200,14 +200,15 @@ function queue_deliver($outq, $immediate = false) {
}
}
if($piled_up) {
- do_delivery($piled_up);
+ // call do_delivery() with the force flag
+ do_delivery($piled_up, true);
}
}
}
else {
logger('deliver: queue post returned ' . $result['return_code']
. ' from ' . $outq['outq_posturl'],LOGGER_DEBUG);
- update_queue_item($outq['outq_hash']);
+ update_queue_item($outq['outq_hash'],10);
}
return;
}