tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not delete collections if a broker is configured.

This commit is contained in:
Ramon Novoa 2014-10-17 13:13:38 +02:00
parent 1cf2af5d54
commit 5e7a653b04
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pandora_agents/unix/pandora_agent
View File

@ -111,6 +111,9 @@ my $ConfDir = '';
# Pandora FMS agent configuration file
my $ConfFile = 'pandora_agent.conf';
# Set to 1 if broker agents are enabled.
my $BrokerEnabled = 0;
# Broker agent configuration files
my @BrokerPid;
@ -674,6 +677,11 @@ sub read_config (;$) {
log_message ('setup', "$1 is $2");
$Conf{$1} = $2;
# Look for broker agents.
if ($1 eq 'broker_agent') {
$BrokerEnabled = 1;
}
# Remove trailing spaces
$Conf{$1} =~ s/\s*$//;
}
@ -963,20 +971,22 @@ sub launch_tentacle_proxy () {
################################################################################
sub check_collections () {
# Delete old collections
opendir (DIR, "$ConfDir/collections") || return;
while (defined (my $file_name = readdir(DIR))) {
next if ($file_name eq '.' || $file_name eq '..');
# Delete old collections if there are no broker agents
if ($BrokerEnabled == 0) {
opendir (DIR, "$ConfDir/collections") || return;
while (defined (my $file_name = readdir(DIR))) {
next if ($file_name eq '.' || $file_name eq '..');
# Do not delete md5 files associated to a collection
$file_name =~ s/\.md5$//;
# Do not delete md5 files associated to a collection
$file_name =~ s/\.md5$//;
if (! defined ($Collections{$file_name})) {
rmrf ("$ConfDir/collections/$file_name");
unlink ("$ConfDir/collections/$file_name.md5");
if (! defined ($Collections{$file_name})) {
rmrf ("$ConfDir/collections/$file_name");
unlink ("$ConfDir/collections/$file_name.md5");
}
}
closedir (DIR);
}
closedir (DIR);
# Download new collections
while (my ($collection, $in_path) = each (%Collections)) {