[freeside-commits] branch FREESIDE_4_BRANCH updated. ae27d43bf9b2bbd8126e4fe1f7c38bba2c4a0407
Ivan Kohler
ivan at freeside.biz
Thu Nov 8 10:53:24 PST 2018
The branch, FREESIDE_4_BRANCH has been updated
via ae27d43bf9b2bbd8126e4fe1f7c38bba2c4a0407 (commit)
from 627682145a5dc1b2e2f4eddc5042383b363b830c (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 ae27d43bf9b2bbd8126e4fe1f7c38bba2c4a0407
Author: Ivan Kohler <ivan at freeside.biz>
Date: Thu Nov 8 10:53:23 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