diff options
| author | Mark Wells <mark@freeside.biz> | 2012-12-11 14:38:07 -0800 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2012-12-11 14:38:07 -0800 |
| commit | 913bd0405d6eb0db41b9944dfd42eb1f97d18ca9 (patch) | |
| tree | ce51c6db058fe65de6f37ec5ce047dc75007cfa3 /FS/bin | |
| parent | bda74e13569c8531e77e8dcd01d9da9038f3c4d0 (diff) | |
system log, #18333
Diffstat (limited to 'FS/bin')
| -rwxr-xr-x | FS/bin/freeside-daily | 5 | ||||
| -rw-r--r-- | FS/bin/freeside-queued | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily index 8e8ae4ff9..65e3ebd97 100755 --- 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 FS::Log; &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 $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); @@ -74,6 +77,8 @@ unlink <${deldir}.CGItemp*>; use FS::Cron::backup qw(backup); backup(); +$log->info('finish'); + ### # subroutines ### diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued index f136c3910..2fd80255e 100644 --- a/FS/bin/freeside-queued +++ b/FS/bin/freeside-queued @@ -11,6 +11,7 @@ use FS::Conf; use FS::Record qw(qsearch); use FS::queue; use FS::queue_depend; +use FS::Log; # no autoloading for non-FS classes... use Net::SSH 0.07; @@ -45,6 +46,7 @@ while ( $@ ) { } } +my $log = FS::Log->new('queue'); logfile( "%%%FREESIDE_LOG%%%/queuelog.". $FS::UID::datasrc ); warn "completing daemonization (detaching))\n" if $DEBUG; @@ -135,6 +137,8 @@ while (1) { foreach my $job ( @jobs ) { + $log->debug('locking queue job', object => $job); + my %hash = $job->hash; $hash{'status'} = 'locked'; my $ljob = new FS::queue ( \%hash ); @@ -205,6 +209,8 @@ while (1) { } my $eval = "&". $ljob->job. '(@args);'; + # don't put @args in the log, may expose passwords + $log->info('starting job ('.$ljob->job.')'); warn 'running "&'. $ljob->job. '('. join(', ', @args). ")\n" if $DEBUG; eval $eval; #throw away return value? suppose so if ( $@ ) { |