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

2013-03-04 Sergio Martin <sergio.martin@artica.es> 

* lib/PandoraFMS/Core.pm
	lib/PandoraFMS/DataServer.pm: Clean code and fix some
	forgotten changes in last GIS code



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7774 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2013-03-04 18:06:46 +00:00
parent 985a6375bc
commit 541d99fdd1
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_server/ChangeLog
View File

@ -1,3 +1,9 @@
2013-03-04 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/Core.pm
lib/PandoraFMS/DataServer.pm: Clean code and fix some
forgotten changes in last GIS code
2013-03-04 Sergio Martin <sergio.martin@artica.es>
* util/pandora_manage.pl: Update fired alert counts when

3
pandora_server/lib/PandoraFMS/Core.pm
View File

@ -180,6 +180,7 @@ our @EXPORT = qw(
pandora_update_agent
pandora_update_agent_address
pandora_update_config_token
pandora_update_gis_data
pandora_update_module_on_error
pandora_update_module_from_hash
pandora_update_server
@ -1914,7 +1915,7 @@ Update agent GIS information.
=cut
##########################################################################
sub pandora_update_gis_data ($$$$$$$$) {
sub pandora_update_gis_data ($$$$$$$$$) {
my ($pa_config, $dbh, $agent_id, $agent_name, $longitude, $latitude, $altitude, $position_description, $timestamp) = @_;
logger($pa_config, "Updating GIS data for agent $agent_name (long: $longitude lat: $latitude alt: $altitude)", 10);

2
pandora_server/lib/PandoraFMS/DataServer.pm
View File

@ -111,7 +111,7 @@ sub data_producer ($) {
push (@files, $file);
$file_count++;
print "QUEUING $file\n";
# Do not queue more than max_queue_files files
if ($file_count >= $pa_config->{"max_queue_files"}) {
last;