[freeside-commits] freeside/FS/bin freeside-daily,1.27,1.28

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/bin
In directory wavetail.420.am:/tmp/cvs-serv28572

Modified Files:
	freeside-daily 
Log Message:
backport freeside-daily -m and cust_main::bill_and_collect to 1.7, RT#4412

Index: freeside-daily
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/bin/freeside-daily,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- freeside-daily	2 Oct 2007 00:32:24 -0000	1.27
+++ freeside-daily	17 Apr 2009 19:20:00 -0000	1.28
@@ -6,7 +6,7 @@
 
 &untaint_argv;	#what it sounds like  (eww)
 use vars qw(%opt);
-getopts("p:a:d:vl:sy:nm", \%opt);
+getopts("p:a:d:vl:sy:nmk", \%opt);
 
 my $user = shift or die &usage;
 adminsuidsetup $user;
@@ -16,15 +16,21 @@
 
 #what to do about the below when using -m?  that is the question.
 
-use FS::Cron::notify qw(notify_flat_delay);
-notify_flat_delay(%opt);
-
+#you don't want to skip this, besides, it should be cheap
 use FS::Cron::expire_user_pref qw(expire_user_pref);
 expire_user_pref();
 
-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();
 
@@ -42,7 +48,7 @@
 }
 
 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";
 }
 
 ###
@@ -55,7 +61,7 @@
 
 =head1 SYNOPSIS
 
-  freeside-daily [ -d 'date' ] [ -y days ] [ -p 'payby' ] [ -a agentnum ] [ -s ] [ -v ] [ -l level ] [ -m ] user [ custnum custnum ... ]
+  freeside-daily [ -d 'date' ] [ -y days ] [ -p 'payby' ] [ -a agentnum ] [ -s ] [ -v ] [ -l level ] [ -m ] [ -k ] user [ custnum custnum ... ]
 
 =head1 DESCRIPTION
 
@@ -89,6 +95,8 @@
 
   -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