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

Merge branch '1765-Colecciones-no-se-despliegan-con-la-v717-del-agente-dev' into 'develop' 

Fixed issue in check_collections

See merge request artica/pandorafms!1260
This commit is contained in:
vgilc 2018-01-24 16:28:14 +01:00
parent cd2c000cbf 96e2f08fa5
commit 14713e30b8
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pandora_agents/unix/pandora_agent
View File

@ -1298,13 +1298,14 @@ sub check_collections () {
# Read local md5 # Read local md5
my $local_collection_md5 = ''; my $local_collection_md5 = '';
if (defined (open (MD5_FILE, "< $ConfDir/collections/$collection_md5_file"))) { if (-f "$ConfDir/collections/$collection_md5_file") {
$local_collection_md5 = <MD5_FILE>; if (open (MD5_FILE, "< $ConfDir/collections/$collection_md5_file")) {
close MD5_FILE; $local_collection_md5 = <MD5_FILE>;
} close MD5_FILE;
else{ } else {
log_message ('Collection', "Could not open dir $ConfDir/collections/$collection_md5_file"); log_message ('Collection', "Could not open dir $ConfDir/collections/$collection_md5_file");
next; next;
}
} }
# Check for changes # Check for changes
@ -1312,7 +1313,7 @@ sub check_collections () {
next if ($local_collection_md5 eq $remote_collection_md5); next if ($local_collection_md5 eq $remote_collection_md5);
# Download and unzip # Download and unzip
if(recv_file ($collection_md5_file, $Conf{'server_path_md5'}) != 0){ if (recv_file ($collection_file, $Conf{'server_path_zip'}) != 0) {
log_message ('Collection', "Could not write $collection_file on " . $Conf{'server_path_zip'}); log_message ('Collection', "Could not write $collection_file on " . $Conf{'server_path_zip'});
next; next;
} }