From 03c9f5e33216c503fb52dc02826426b17f01f629 Mon Sep 17 00:00:00 2001 From: Jonathan Prykop Date: Mon, 13 Apr 2015 17:59:12 -0500 Subject: RT#18834 Cacti integration [schema history fix and cleanup refactor] --- FS/bin/freeside-daily | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'FS/bin/freeside-daily') diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily index a79381326..1162e7911 100755 --- a/FS/bin/freeside-daily +++ b/FS/bin/freeside-daily @@ -74,15 +74,9 @@ export_batch_submit(%opt); use FS::Cron::agent_email qw(agent_email); agent_email(%opt); -#does nothing unless there are cacti imports -#should run before backup, no need to backup cacti imports -use FS::Cron::cacti_cleanup qw(cacti_cleanup); -cacti_cleanup(); - -my $deldir = "$FS::UID::cache_dir/cache.$FS::UID::datasrc/"; -unlink <${deldir}.invoice*>; -unlink <${deldir}.letter*>; -unlink <${deldir}.CGItemp*>; +#clears out cacti imports & deletes select database cache files +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 @@ -90,7 +84,6 @@ 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'); -- cgit v1.2.1