projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NG auth: fix new customer, remove mapsecrets support, RT#21563
[freeside.git]
/
FS
/
bin
/
freeside-daily
diff --git
a/FS/bin/freeside-daily
b/FS/bin/freeside-daily
index
2b33d16
..
ac93aaf
100755
(executable)
--- a/
FS/bin/freeside-daily
+++ b/
FS/bin/freeside-daily
@@
-4,13
+4,16
@@
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);
-getopts("p:a:d:vl:sy:nmrkg:
u
o", \%opt);
+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);
@@
-51,16
+54,6
@@
unless ( $opt{k} ) {
notify_flat_delay(%opt);
}
notify_flat_delay(%opt);
}
-#debian Pg 8.1+ auto-vaccums, 7.4 w/postgresql-contrib
-if ( $opt{u} ) {
- use FS::Cron::vacuum qw(vacuum);
- vacuum();
-}
-
-#you can skip this just by not having the config
-use FS::Cron::backup qw(backup);
-backup();
-
#same
use FS::Cron::rt_tasks qw(rt_daily);
rt_daily(%opt);
#same
use FS::Cron::rt_tasks qw(rt_daily);
rt_daily(%opt);
@@
-70,11
+63,22
@@
use FS::Cron::pay_batch qw(batch_submit batch_receive);
batch_submit(%opt);
batch_receive(%opt);
batch_submit(%opt);
batch_receive(%opt);
+#you can skip this by not having the config
+use FS::Cron::agent_email qw(agent_email);
+agent_email(%opt);
+
my $deldir = "$FS::UID::cache_dir/cache.$FS::UID::datasrc/";
unlink <${deldir}.invoice*>;
unlink <${deldir}.letter*>;
unlink <${deldir}.CGItemp*>;
my $deldir = "$FS::UID::cache_dir/cache.$FS::UID::datasrc/";
unlink <${deldir}.invoice*>;
unlink <${deldir}.letter*>;
unlink <${deldir}.CGItemp*>;
+#backup should be last
+#you can skip this just by not having the config
+use FS::Cron::backup qw(backup);
+backup();
+
+$log->info('finish');
+
###
# subroutines
###
###
# subroutines
###
@@
-139,14
+143,12
@@
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
- -u: Do a vacuum (starting with version 1.9, this is not run by default).
-
user: From the mapsecrets file - see config.html from the base documentation
custnum: if one or more customer numbers are specified, only bills those
user: From the mapsecrets file - see config.html from the base documentation
custnum: if one or more customer numbers are specified, only bills those