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

2014-03-13 Vanessa Gil <vanessa.gil@artica.es> 

* 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
This commit is contained in:
vgilc 2014-03-13 07:28:56 +00:00
parent 8ef7532162
commit d5a7befa29
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 @@
2014-03-13 Vanessa Gil <vanessa.gil@artica.es>
* lib/PandoraFMS/Core.pm
util/pandora_dbstress.pl: Fixed bug executing
pandora_dbstress.
2014-03-05 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/Core.pm: Add action recovery fields to the

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

@ -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);

2
pandora_server/util/pandora_dbstress.pl
View File

@ -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;