From bb69d3483e07c6f24c9faebeffbbef8bde9482f6 Mon Sep 17 00:00:00 2001 From: vgilc Date: Thu, 13 Mar 2014 07:28:56 +0000 Subject: [PATCH] 2014-03-13 Vanessa Gil * lib/PandoraFMS/Core.pm util/pandora_dbstress.pl: Fixed bug executing pandora_dbstress. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9573 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 6 ++++++ pandora_server/lib/PandoraFMS/Core.pm | 3 ++- pandora_server/util/pandora_dbstress.pl | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index 01ebc45074..570cb954b4 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,9 @@ +2014-03-13 Vanessa Gil + + * lib/PandoraFMS/Core.pm + util/pandora_dbstress.pl: Fixed bug executing + pandora_dbstress. + 2014-03-05 Sergio Martin * lib/PandoraFMS/Core.pm: Add action recovery fields to the diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index 3ecf0dab39..2cfd43a8bd 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -4043,7 +4043,8 @@ Get a list of module tags in the format: |tag|tag| ... |tag| sub pandora_get_module_tags ($$$) { my ($pa_config, $dbh, $id_agentmodule) = @_; - my @tags = get_db_rows ($dbh, 'SELECT ' . db_concat('ttag.name', 'ttag.url') . ' name_url FROM ttag, ttag_module + #~ my @tags = get_db_rows ($dbh, 'SELECT ' . db_concat('ttag.name', 'ttag.url') . ' name_url FROM ttag, ttag_module + my @tags = get_db_rows ($dbh, 'SELECT ttag.name,ttag.url name_url FROM ttag, ttag_module WHERE ttag.id_tag = ttag_module.id_tag AND ttag_module.id_agente_modulo = ?', $id_agentmodule); diff --git a/pandora_server/util/pandora_dbstress.pl b/pandora_server/util/pandora_dbstress.pl index 5c258b8ad3..433dc8244c 100755 --- a/pandora_server/util/pandora_dbstress.pl +++ b/pandora_server/util/pandora_dbstress.pl @@ -130,7 +130,7 @@ sub process_module($$$$$){ my $iterations = ($target_days * 24 * 60 * 60) / $target_interval; - print " [D] ID_AgenteMoludo $id_agentemodulo Interval $target_interval ModuleName $target_name Days $target_days Agent $agent->{'nombre'} \n"; + print " [D] ID_AgenteModulo $id_agentemodulo Interval $target_interval ModuleName $target_name Days $target_days Agent $agent->{'nombre'} \n"; my $modules_processed=0; my $modules_processed_total=0;