From 541d99fdd10283f8b29321df0d8be6542a3625bb Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Mon, 4 Mar 2013 18:06:46 +0000 Subject: [PATCH] 2013-03-04 Sergio Martin * 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 --- pandora_server/ChangeLog | 6 ++++++ pandora_server/lib/PandoraFMS/Core.pm | 3 ++- pandora_server/lib/PandoraFMS/DataServer.pm | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index 9df433e2ee..4e4daa5dbb 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,9 @@ +2013-03-04 Sergio Martin + + * lib/PandoraFMS/Core.pm + lib/PandoraFMS/DataServer.pm: Clean code and fix some + forgotten changes in last GIS code + 2013-03-04 Sergio Martin * util/pandora_manage.pl: Update fired alert counts when diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index cfbc48b21a..e56c10d463 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -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); diff --git a/pandora_server/lib/PandoraFMS/DataServer.pm b/pandora_server/lib/PandoraFMS/DataServer.pm index f8e7a5a601..de7126805c 100644 --- a/pandora_server/lib/PandoraFMS/DataServer.pm +++ b/pandora_server/lib/PandoraFMS/DataServer.pm @@ -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;