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

2013-07-09 Miguel de Dios <miguel.dedios@artica.es> 

* lib/PandoraFMS/PredictionServer.pm, util/pandora_xml_stress.pl:
	improved the source code style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8499 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-07-09 09:28:10 +00:00
parent 1141f4e418
commit f90fe2042f
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_server/ChangeLog
View File

@ -1,3 +1,8 @@
2013-07-09 Miguel de Dios <miguel.dedios@artica.es>
* lib/PandoraFMS/PredictionServer.pm, util/pandora_xml_stress.pl:
improved the source code style.
2013-07-05 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Added macros _snmp_oid_ and _snmp_value_ to

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

@ -156,6 +156,7 @@ sub exec_prediction_module ($$$$) {
# Service modules
if ($agent_module->{'prediction_module'} == 2) {
if ($agent_module->{'custom_string_1'} eq 'SLA') {
logger ($pa_config, "Executing service module SLA " .
$agent_module->{'id_agente_modulo'} . " " .
@ -170,6 +171,7 @@ sub exec_prediction_module ($$$$) {
enterprise_hook ('exec_service_module', [$pa_config, $agent_module, $server_id, $dbh]);
logger ($pa_config, "End execution", 5);
}
return;
}

4
pandora_server/util/pandora_xml_stress.pl
View File

@ -188,7 +188,7 @@ sub generate_xml_files ($$$$$$) {
$xml_data .= "\t\t<name>$module_name</name>\n";
$xml_data .= "\t\t<description>$module_description</description>\n";
$xml_data .= "\t\t<type>$module_type</type>\n";
if ($module_min_critical ne '') {
$xml_data .= "\t\t<min_critical>$module_min_critical</min_critical>\n";
}
@ -389,7 +389,7 @@ sub generate_data_from_source ($$$) {
$pointer = $pointers->{$module_name};
$pointer = $pointer % ($#data_array+1);
$pointer = $pointer % ($#data_array + 1);
$data = $data_array[$pointer];