X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-daily;h=6d4182b79ba02a17fe0561138df77997dd10a3f4;hb=024d64da1f139ffbcbb52fe071851b9539bebe31;hp=8d195a8ca731a099df857f065143aea85c2810d0;hpb=bffe94d18041de995907fb8cc3fade4e8b20c241;p=freeside.git

diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily
index 8d195a8ca..6d4182b79 100755
--- a/FS/bin/freeside-daily
+++ b/FS/bin/freeside-daily
@@ -8,7 +8,7 @@ use FS::Log;
 
 &untaint_argv;	#what it sounds like  (eww)
 use vars qw(%opt);
-getopts("p:a:d:vl:sy:nmrkg:o", \%opt);
+getopts("p:a:d:vl:sy:nmqrkg:ox", \%opt);
 
 my $user = shift or die &usage;
 adminsuidsetup $user;
@@ -55,14 +55,6 @@ tax_rate_update(%opt);
 use FS::Cron::set_lata_have_usage qw(set_lata_have_usage);
 set_lata_have_usage(%opt);
 
-# we used to send alerts about upcoming credit card expiration here
-my $conf = new FS::Conf;
-if($conf->exists('alert_expiration')) {
-  warn "WARNING: the alert_expiration option is obsolete.  If you ran 
-  freeside-upgrade, it should have configured credit card expiration alerts 
-  as billing events.\n";
-}
-
 #what to do about the below when using -m?  that is the question.
 
 #you don't want to skip this, besides, it should be cheap
@@ -100,9 +92,9 @@ use FS::Cron::cleanup qw( cleanup cleanup_before_backup );
 cleanup_before_backup();
 
 #backup should be last
-#you can skip this just by not having the config
+#you can skip this just by not having the config (or with the -x option)
 use FS::Cron::backup qw(backup);
-backup();
+backup() unless $opt{'x'};
 
 #except we'd rather not start cleanup jobs until the backup is done
 cleanup( quiet => !$opt{'v'} );
@@ -123,7 +115,7 @@ sub untaint_argv {
 }
 
 sub usage {
-  die "Usage:\n\n  freeside-daily [ -d 'date' ] [ -y days ] [ -a agentnum,agentnum,... ] [ -s ] [ -v ] [ -l level ] [ -m ] [ -k ] user [ custnum custnum ... ]\n";
+  die "Usage:\n\n  freeside-daily [ -d 'date' ] [ -y days ] [ -a agentnum,agentnum,... ] [ -s ] [ -v ] [ -l level ] [ -m ] [ -k ] [ -x ] user [ custnum custnum ... ]\n";
 }
 
 ###
@@ -136,7 +128,7 @@ freeside-daily - Run daily billing and invoice collection events.
 
 =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
 
@@ -175,10 +167,14 @@ the bill and collect methods of a cust_main object.  See L<FS::cust_main>.
 
   -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
 
+  -x: skip backup
+
 user: Typically "fs_daily"
 
 custnum: if one or more customer numbers are specified, only bills those