backport freeside-daily -m and cust_main::bill_and_collect to 1.7, RT#4412

1 files changed, 20 insertions, 7 deletions

diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily
index d5748d6b9..d76cb37b9 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:vsy:n", \%opt);
+getopts("p:a:d:vl:sy:nmk", \%opt);
 
 my $user = shift or die &usage;
 adminsuidsetup $user;
@@ -14,12 +14,19 @@ adminsuidsetup $user;
 use FS::Cron::bill qw(bill);
 bill(%opt);
 
-use FS::Cron::notify qw(notify_flat_delay);
-notify_flat_delay(%opt);
+#what to do about the below when using -m?  that is the question.
 
-use FS::Cron::vacuum qw(vacuum);
-vacuum();
+unless ( $opt{k} ) {
 
+  use FS::Cron::notify qw(notify_flat_delay);
+  notify_flat_delay(%opt);
+
+  use FS::Cron::vacuum qw(vacuum);
+  vacuum();
+
+}
+
+#you can skip this just by not having the config
 use FS::Cron::backup qw(backup_scp);
 backup_scp();
 
@@ -37,7 +44,7 @@ sub untaint_argv {
 }
 
 sub usage {
-  die "Usage:\n\n  freeside-daily [ -d 'date' ] user [ custnum custnum ... ]\n";
+  die "Usage:\n\n  freeside-daily [ -d 'date' ] [ -y days ] [ -p 'payby' ] [ -a agentnum ] [ -s ] [ -v ] [ -l level ] [ -m ] [ -k ] user [ custnum custnum ... ]\n";
 }
 
 ###
@@ -50,7 +57,7 @@ freeside-daily - Run daily billing and invoice collection events.
 
 =head1 SYNOPSIS
 
-  freeside-daily [ -d 'date' ] [ -y days ] [ -p 'payby' ] [ -a agentnum ] [ -s ] [ -v ] user [ custnum custnum ... ]
+  freeside-daily [ -d 'date' ] [ -y days ] [ -p 'payby' ] [ -a agentnum ] [ -s ] [ -v ] [ -l level ] [ -m ] [ -k ] user [ custnum custnum ... ]
 
 =head1 DESCRIPTION
 
@@ -80,6 +87,12 @@ the bill and collect methods of a cust_main object.  See L<FS::cust_main>.
 
   -v: enable debugging
 
+  -l: debugging level
+
+  -m: Experimental multi-process mode uses the job queue for multi-process and/or multi-machine billing.
+
+  -k: skip notify_flat_delay and vacuum
+
 user: From the mapsecrets file - see config.html from the base documentation
 
 custnum: if one or more customer numbers are specified, only bills those