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

Agent remote cmd fixes

This commit is contained in:
fbsanchez 2019-11-14 17:04:47 +01:00
parent 78443a029d
commit 17f324ef8d
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pandora_agents/unix/pandora_agent
View File

@ -979,6 +979,9 @@ sub read_config (;$) {
$Conf{'secondary_server_opts'} = '-x \'' . $Conf{'secondary_server_pwd'} . '\' ' . $Conf{'secondary_server_opts'} if ($Conf{'secondary_server_pwd'} ne ''); $Conf{'secondary_server_opts'} = '-x \'' . $Conf{'secondary_server_pwd'} . '\' ' . $Conf{'secondary_server_opts'} if ($Conf{'secondary_server_pwd'} ne '');
$Conf{'secondary_server_opts'} = '-c ' . $Conf{'secondary_server_opts'} if ($Conf{'secondary_server_ssl'} eq '1'); $Conf{'secondary_server_opts'} = '-c ' . $Conf{'secondary_server_opts'} if ($Conf{'secondary_server_ssl'} eq '1');
} }
# Check remote commands
prepare_commands();
} }
################################################################################# #################################################################################
@ -1421,7 +1424,7 @@ sub check_collections () {
################################################################################ ################################################################################
# Check for remote commands defined. # Check for remote commands defined.
################################################################################ ################################################################################
sub prepare_remote_commands { sub prepare_commands {
if ($YAML == 0) { if ($YAML == 0) {
log_message( log_message(
'error', 'error',
@ -3272,21 +3275,25 @@ while (1) {
check_collections () unless ($Conf{'debug'} eq '1'); check_collections () unless ($Conf{'debug'} eq '1');
if ($Conf{'debug'} ne '1') { if ($Conf{'debug'} ne '1') {
# Check remote commands # Cleanup old .rcmd and .rcmd.done files.
prepare_remote_commands (); my %registered = map { $_.'.rcmd' => 1 } keys %{$Conf{'commands'}};
# Cleanup old .rcmd.done files.
my %registered = map { $_.'.rcmd.done' => 1 } keys %{$Conf{'commands'}};
if(opendir(my $dir, $ConfDir.'/commands/')) { if(opendir(my $dir, $ConfDir.'/commands/')) {
while (my $item = readdir($dir)) { while (my $item = readdir($dir)) {
# Skip other files. # Skip other files.
next if ($item !~ /\.rcmd\.done$/); next if ($item !~ /\.rcmd$/);
# Clean .rcmd.done file if its command is not referenced in conf. # Clean .rcmd.done file if its command is not referenced in conf.
if (!defined($registered{$item})) { if (!defined($registered{$item})) {
unlink ($item); if (-e $item) {
unlink ($item);
}
if (-e $item.'.done') {
unlink ($item.'.done');
}
} }
} }
# Close dir.
closedir($dir);
} }
} }