X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-daily;h=14d797f4958a34aa3d01972dc514df11a1b45431;hb=13f21e01ac9faa50c07f64c20cbceae0ae50790c;hp=65e3ebd97ec577c52798c2d78bb9fd45acecd351;hpb=913bd0405d6eb0db41b9944dfd42eb1f97d18ca9;p=freeside.git

diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily
index 65e3ebd97..14d797f49 100755
--- a/FS/bin/freeside-daily
+++ b/FS/bin/freeside-daily
@@ -38,10 +38,13 @@ upload(%opt);
 use FS::Cron::set_lata_have_usage qw(set_lata_have_usage);
 set_lata_have_usage(%opt);
 
-# Send alerts about upcoming credit card expiration.
-use FS::Cron::alert_expiration qw(alert_expiration);
+# we used to send alerts about upcoming credit card expiration here
 my $conf = new FS::Conf;
-alert_expiration(%opt) if($conf->exists('alert_expiration'));
+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.
 
@@ -77,6 +80,10 @@ unlink <${deldir}.CGItemp*>;
 use FS::Cron::backup qw(backup);
 backup();
 
+#except we'd rather not start cleanup jobs until the backup is done
+use FS::Cron::cleanup qw(cleanup);
+cleanup();
+
 $log->info('finish');
 
 ###
@@ -143,13 +150,13 @@ the bill and collect methods of a cust_main object.  See L<FS::cust_main>.
 
   -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.
 
   -r: Multi-process mode dry run option
 
   -k: skip notify_flat_delay
 
-user: From the mapsecrets file - see config.html from the base documentation
+user: Typically "fs_daily"
 
 custnum: if one or more customer numbers are specified, only bills those
 customers.  Otherwise, bills all customers.