tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-09-26 03:19:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-7320-11651-creacion-masiva-de-xml-incorrectos-con-servidor-develop' into 'develop'

Browse Source 
Ent 7320 11651 creacion masiva de xml incorrectos con servidor develop

See merge request artica/pandorafms!4038
This commit is contained in:
vgilc 2021-04-20 08:55:21 +00:00
commit d380e2cd45
1 changed files with 50 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_server/lib/PandoraFMS/PluginTools.pm
View File

@ -792,6 +792,7 @@ sub transfer_xml {
my $file_name; my $file_name;
my $file_path; my $file_path;
if (! -f $xml) {
if (! (empty ($name))) { if (! (empty ($name))) {
$file_name = $name . "." . sprintf("%d",getCurrentUTimeMilis(). (rand()*10000)) . ".data"; $file_name = $name . "." . sprintf("%d",getCurrentUTimeMilis(). (rand()*10000)) . ".data";
} }
@ -845,6 +846,10 @@ sub transfer_xml {
close ($FD); close ($FD);
} else {
$file_path = $xml;
}
# Reassign default values if not present # Reassign default values if not present
$conf->{tentacle_client} = "tentacle_client" if empty($conf->{tentacle_client}); $conf->{tentacle_client} = "tentacle_client" if empty($conf->{tentacle_client});
$conf->{tentacle_port} = "41121" if empty($conf->{tentacle_port}); $conf->{tentacle_port} = "41121" if empty($conf->{tentacle_port});