# -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 {
- #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 {
};
my $error = $queue->insert( 'custnum'=>$custnum, %args );
die $error if $error;
+
+ foreach $waiting_queue (@waiting) {
+ $queue->depend_insert($waiting_queue->jobnum);
+ }
+
}
} else {
&untaint_argv; #what it sounds like (eww)
use vars qw(%opt);
-getopts("p:a:d:vl:sy:nmrkg:ox", \%opt);
+getopts("p:a:d:vl:sy:nmqrkg:ox", \%opt);
my $user = shift or die &usage;
adminsuidsetup $user;
=head1 SYNOPSIS
- freeside-daily [ -d 'date' ] [ -y days ] [ -a agentnum,agentnum,... ] [ -s ] [ -o ] [ -v ] [ -l level ] [ -m ] [ -r ] [ -k ] user [ custnum custnum ... ]
+ freeside-daily [ -d 'date' ] [ -y days ] [ -a agentnum,agentnum,... ] [ -s ] [ -o ] [ -v ] [ -l level ] [ -m [ -q ] [ -r ] ] [ -k ] user [ custnum custnum ... ]
=head1 DESCRIPTION
-m: Multi-process mode uses the job queue for multi-process and/or multi-machine billing.
+ -q: When using multi-process mode, queue a additional billing job even if ones for the customer are already in the queue
+
-r: Multi-process mode dry run option
-k: skip notify_flat_delay