diff options
author | Ivan Kohler <ivan@freeside.biz> | 2018-11-08 10:51:09 -0800 |
---|---|---|
committer | Ivan Kohler <ivan@freeside.biz> | 2018-11-08 10:51:09 -0800 |
commit | 627682145a5dc1b2e2f4eddc5042383b363b830c (patch) | |
tree | 70622a2cc5dea9945fdd75117978a92d8e28a215 /FS/FS/Cron | |
parent | 2835557fda9a4fca3e5d75c9851828f081c51062 (diff) |
add option for multi-process billing to queue additional jobs for the same customer instead of skipping them, RT#81698
Diffstat (limited to 'FS/FS/Cron')
-rw-r--r-- | FS/FS/Cron/bill.pm | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/FS/FS/Cron/bill.pm b/FS/FS/Cron/bill.pm index 30eb1ab..68d5476 100644 --- a/FS/FS/Cron/bill.pm +++ b/FS/FS/Cron/bill.pm @@ -22,7 +22,8 @@ use FS::Log; # -s: re-charge setup fees # -v: enable debugging # -l: debugging level -# -m: Experimental multi-process mode uses the job queue for multi-process and/or multi-machine billing. +# -m: Multi-process mode uses the job queue for multi-process and/or multi-machine billing. +# -q: Multi-process mode: queue additional job instead of skipping # -r: Multi-process mode dry run option # -g: Don't bill these pkgparts @@ -109,12 +110,14 @@ sub bill { warn "DRY RUN: would add custnum $custnum for queued_bill\n"; } else { - #avoid queuing another job if there's one still waiting to run - next if qsearch( 'queue', { 'job' => 'FS::cust_main::queued_bill', - 'custnum' => $custnum, - 'status' => 'new', - } - ); + my @waiting = qsearch( 'queue', { + 'job' => 'FS::cust_main::queued_bill', + 'custnum' => $custnum, + 'status' => 'new', + } + ); + + next if @waiting && ! $opt{'q'}; #add job to queue that calls bill_and_collect with options my $queue = new FS::queue { @@ -124,6 +127,11 @@ sub bill { }; my $error = $queue->insert( 'custnum'=>$custnum, %args ); die $error if $error; + + foreach $waiting_queue (@waiting) { + $queue->depend_insert($waiting_queue->jobnum); + } + } } else { |