Fixed empty agent_name in pandora_agent

This commit is contained in:
danielmaya 2017-11-27 15:01:09 +01:00
parent 7b3e71f79a
commit 4f91a8f12b

View File

@ -832,7 +832,7 @@ sub read_config (;$) {
config_update('agent_name', $Conf{'agent_name'}); config_update('agent_name', $Conf{'agent_name'});
} elsif ($Conf{'agent_name_cmd'} ne '') { } elsif ($Conf{'agent_name_cmd'} ne '') {
my $result = `$Conf{'agent_name_cmd'}`; my $result = `$Conf{'agent_name_cmd'}`;
if($result ne '') {
# Use only the first line. # Use only the first line.
my ($temp_agent_name, $remain) = split(/\n/, $result); my ($temp_agent_name, $remain) = split(/\n/, $result);
chomp ($temp_agent_name); chomp ($temp_agent_name);
@ -841,10 +841,14 @@ sub read_config (;$) {
$temp_agent_name =~ s/^ *(.*?) *$/$1/; $temp_agent_name =~ s/^ *(.*?) *$/$1/;
$Conf{'agent_name'} = $temp_agent_name if ($temp_agent_name ne ''); $Conf{'agent_name'} = $temp_agent_name if ($temp_agent_name ne '');
} else {
$Conf{'agent_name'} = hostname();
} }
} }
}
# Fall back to the hostname if agent_name is still empty.
if ($Conf{'agent_name'} eq '') {
$Conf{'agent_name'} = hostname();
}
# Update the agent MD5 since agent_name may have changed # Update the agent MD5 since agent_name may have changed
$AgentMD5 = md5 ($Conf{'agent_name'}); $AgentMD5 = md5 ($Conf{'agent_name'});