projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
check old_password if passed to self-service API, require with config setting, RT...
[freeside.git]
/
FS
/
bin
/
freeside-daily
diff --git
a/FS/bin/freeside-daily
b/FS/bin/freeside-daily
index
8e8ae4f
..
14d797f
100755
(executable)
--- a/
FS/bin/freeside-daily
+++ b/
FS/bin/freeside-daily
@@
-4,6
+4,7
@@
use strict;
use Getopt::Std;
use FS::UID qw(adminsuidsetup);
use FS::Conf;
use Getopt::Std;
use FS::UID qw(adminsuidsetup);
use FS::Conf;
+use FS::Log;
&untaint_argv; #what it sounds like (eww)
use vars qw(%opt);
&untaint_argv; #what it sounds like (eww)
use vars qw(%opt);
@@
-11,6
+12,8
@@
getopts("p:a:d:vl:sy:nmrkg:o", \%opt);
my $user = shift or die &usage;
adminsuidsetup $user;
my $user = shift or die &usage;
adminsuidsetup $user;
+my $log = FS::Log->new('daily');
+$log->info('start');
#you can skip this by not having a NetworkMonitoringSystem configured
use FS::Cron::nms_report qw(nms_report);
#you can skip this by not having a NetworkMonitoringSystem configured
use FS::Cron::nms_report qw(nms_report);
@@
-35,10
+38,13
@@
upload(%opt);
use FS::Cron::set_lata_have_usage qw(set_lata_have_usage);
set_lata_have_usage(%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;
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.
#what to do about the below when using -m? that is the question.
@@
-74,6
+80,12
@@
unlink <${deldir}.CGItemp*>;
use FS::Cron::backup qw(backup);
backup();
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');
+
###
# subroutines
###
###
# subroutines
###
@@
-138,13
+150,13
@@
the bill and collect methods of a cust_main object. See L<FS::cust_main>.
-l: debugging level
-l: debugging level
- -m:
Experimental m
ulti-process mode uses the job queue for multi-process and/or multi-machine billing.
+ -m:
M
ulti-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
-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.
custnum: if one or more customer numbers are specified, only bills those
customers. Otherwise, bills all customers.