MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

With the new queue we don't need "delivery_batch_count" anymore

Browse source
This commit is contained in:
Michael Vogel 2015-09-13 08:08:13 +02:00
parent 12659fc3a1
commit 69daaa61ba
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/notifier.php
View file

@ -638,7 +638,7 @@ function notifier_run(&$argv, &$argc){
// This controls the number of deliveries to execute with each separate delivery process.
// By default we'll perform one delivery per process. Assuming a hostile shared hosting
// provider, this provides the greatest chance of deliveries if processes start getting
// provider, this provides the greatest chance of deliveries if processes start getting
// killed. We can also space them out with the delivery_interval to also help avoid them
// getting whacked.
@ -646,8 +646,10 @@ function notifier_run(&$argv, &$argc){
// together into a single process. This will reduce the overall number of processes
// spawned for each delivery, but they will run longer.
// When using the workerqueue, we don't need this functionality.
$deliveries_per_process = intval(get_config('system','delivery_batch_count'));
if($deliveries_per_process <= 0)
if (($deliveries_per_process <= 0) OR get_config("system", "worker"))
$deliveries_per_process = 1;
$this_batch = array();