# -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
warn "DRY RUN: would add custnum $custnum for queued_bill\n";
} else {
+ my @waiting = qsearch( 'queue', {
+ 'job' => 'FS::cust_main::queued_bill',
+ 'custnum' => $custnum,
+ 'status' => 'new',
+ }
+ );
+
#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',
- }
- );
+ next if @waiting && ! $opt{'q'};
#add job to queue that calls bill_and_collect with options
my $queue = new FS::queue {
'priority' => 99, #don't get in the way of provisioning jobs
};
my $error = $queue->insert( 'custnum'=>$custnum, %args );
+ die $error if $error;
+
+ #wait until the earler jobs complete
+ foreach my $waiting_queue (@waiting) {
+ $queue->depend_insert($waiting_queue->jobnum);
+ }
}
if ( $disable_bill ) {
$cust_main->collect( %args, 'debug' => $debug );
} else {
- $cust_main->bill_and_collect( %args, 'debug' => $debug );
+ my $error = $cust_main->bill_and_collect( %args, 'fatal' => 'return',
+ 'debug' => $debug, );
+ if ( $error ) {
+ $log->error($error);
+ warn $error; #die $error;
+ }
}
}