tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '765-Error-CRON-6.0' into 'pandora_6.0'

Browse Source 
fixed errors cron

See merge request !422
This commit is contained in:
vgilc 2017-05-03 09:24:07 +02:00
commit 708a53a824
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_server/util/pandora_db.pl
View File

@ -375,7 +375,7 @@ sub pandora_purgedb ($$) {
# Delete old netflow data
if ($conf->{'_netflow_max_lifetime'} > 0) {
if (defined ($conf->{'_netflow_max_lifetime'}) && $conf->{'_netflow_max_lifetime'} > 0) {
log_message ('PURGE', "Deleting old netflow data.");
if (! defined ($conf->{'_netflow_path'}) || ! -d $conf->{'_netflow_path'}) {
log_message ('!', "Netflow data directory does not exist, skipping.");
@ -1038,8 +1038,10 @@ else {
# Connect to the DB
my $dbh = db_connect ($conf{'dbengine'}, $conf{'dbname'}, $conf{'dbhost'}, $conf{'dbport'}, $conf{'dbuser'}, $conf{'dbpass'});
my $history_dbh = ($conf{'_history_db_enabled'} eq '1') ? db_connect ($conf{'dbengine'}, $conf{'_history_db_name'},
if (defined($conf{'_history_db_enabled'})) {
my $history_dbh = ($conf{'_history_db_enabled'} eq '1') ? db_connect ($conf{'dbengine'}, $conf{'_history_db_name'},
$conf{'_history_db_host'}, $conf{'_history_db_port'}, $conf{'_history_db_user'}, $conf{'_history_db_pass'}) : undef;
}
# Get a lock
my $lock = db_get_lock ($dbh, 'pandora_db');