diff options
| author | ivan <ivan> | 2009-04-25 22:42:40 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2009-04-25 22:42:40 +0000 |
| commit | f8f8613866ba3df9a571922046978623943ccb14 (patch) | |
| tree | eddc5130d78c43906f8a940d2cd1c276fb4026d6 | |
| parent | 2f7258c405692391d07ae96efef2e471a71849f9 (diff) | |
add dry run to multi-process mode for testing, RT#4412
| -rw-r--r-- | FS/FS/Cron/bill.pm | 18 | ||||
| -rwxr-xr-x | FS/bin/freeside-daily | 6 |
2 files changed, 15 insertions, 9 deletions
diff --git a/FS/FS/Cron/bill.pm b/FS/FS/Cron/bill.pm index 225b372f2..2b5fab476 100644 --- a/FS/FS/Cron/bill.pm +++ b/FS/FS/Cron/bill.pm @@ -138,13 +138,17 @@ END if ( $opt{'m'} ) { - #add job to queue that calls bill_and_collect with options - my $queue = new FS::queue { - 'job' => 'FS::cust_main::queued_bill', - 'secure' => 'Y', - 'priority' => 99, #don't get in the way of provisioning jobs - }; - my $error = $queue->insert( 'custnum'=>$custnum, %args ); + if ( $opt{'r'} ) { + warn "DRY RUN: would add custnum $custnum for queued_bill\n"; + } else { + #add job to queue that calls bill_and_collect with options + my $queue = new FS::queue { + 'job' => 'FS::cust_main::queued_bill', + 'secure' => 'Y', + 'priority' => 99, #don't get in the way of provisioning jobs + }; + my $error = $queue->insert( 'custnum'=>$custnum, %args ); + } } else { diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily index d42e5248b..bda42f025 100755 --- a/FS/bin/freeside-daily +++ b/FS/bin/freeside-daily @@ -6,7 +6,7 @@ use FS::UID qw(adminsuidsetup); &untaint_argv; #what it sounds like (eww) use vars qw(%opt); -getopts("p:a:d:vl:sy:nmk", \%opt); +getopts("p:a:d:vl:sy:nmrk", \%opt); my $user = shift or die &usage; adminsuidsetup $user; @@ -61,7 +61,7 @@ freeside-daily - Run daily billing and invoice collection events. =head1 SYNOPSIS - freeside-daily [ -d 'date' ] [ -y days ] [ -p 'payby' ] [ -a agentnum ] [ -s ] [ -v ] [ -l level ] [ -m ] [ -k ] user [ custnum custnum ... ] + freeside-daily [ -d 'date' ] [ -y days ] [ -p 'payby' ] [ -a agentnum ] [ -s ] [ -v ] [ -l level ] [ -m ] [ -r ] [ -k ] user [ custnum custnum ... ] =head1 DESCRIPTION @@ -95,6 +95,8 @@ the bill and collect methods of a cust_main object. See L<FS::cust_main>. -m: Experimental multi-process mode uses the job queue for multi-process and/or multi-machine billing. + -r: Multi-process mode dry run option + -k: skip notify_flat_delay and vacuum user: From the mapsecrets file - see config.html from the base documentation |