[freeside-commits] branch master updated. c93b76cc3c1ca489825eb876cd5e2863e9a1dd62
Ivan Kohler
ivan at freeside.biz
Thu Nov 8 10:53:21 PST 2018
The branch, master has been updated
via c93b76cc3c1ca489825eb876cd5e2863e9a1dd62 (commit)
from 2db2afe957a655c5048031c86441b900c53f4dd2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c93b76cc3c1ca489825eb876cd5e2863e9a1dd62
Author: Ivan Kohler <ivan at freeside.biz>
Date: Thu Nov 8 10:53:20 2018 -0800
add option for multi-process billing to queue additional jobs for the same customer instead of skipping them, RT#81698
diff --git a/FS/FS/Cron/bill.pm b/FS/FS/Cron/bill.pm
index 68d547633..b0d1f32cc 100644
--- a/FS/FS/Cron/bill.pm
+++ b/FS/FS/Cron/bill.pm
@@ -117,6 +117,7 @@ sub bill {
}
);
+ #avoid queuing another job if there's one still waiting to run
next if @waiting && ! $opt{'q'};
#add job to queue that calls bill_and_collect with options
@@ -128,6 +129,7 @@ sub bill {
my $error = $queue->insert( 'custnum'=>$custnum, %args );
die $error if $error;
+ #wait until the earler jobs complete
foreach $waiting_queue (@waiting) {
$queue->depend_insert($waiting_queue->jobnum);
}
-----------------------------------------------------------------------
Summary of changes:
FS/FS/Cron/bill.pm | 2 ++
1 file changed, 2 insertions(+)
More information about the freeside-commits
mailing list