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

Error fixes

This commit is contained in:
Alejandro Gallardo Escobar 2015-07-10 15:20:28 +02:00
parent 398185bc8e
commit 13a5b8aba2
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pandora_console/include/functions_reporting.php
View File

@ -493,7 +493,7 @@ function reporting_SLA($report, $content, $type = 'dinamic',
// Table Planned Downtimes // Table Planned Downtimes
require_once ($config['homedir'] . '/include/functions_planned_downtimes.php'); require_once ($config['homedir'] . '/include/functions_planned_downtimes.php');
$metaconsole_on = ($config['metaconsole'] == 1) && defined('METACONSOLE'); $metaconsole_on = is_metaconsole();
$downtime_malformed = false; $downtime_malformed = false;
$planned_downtimes_empty = true; $planned_downtimes_empty = true;
@ -618,7 +618,7 @@ function reporting_SLA($report, $content, $type = 'dinamic',
foreach ($slas as $sla) { foreach ($slas as $sla) {
$server_name = $sla ['server_name']; $server_name = $sla ['server_name'];
//Metaconsole connection //Metaconsole connection
if (($config ['metaconsole'] == 1) && $server_name != '' && defined('METACONSOLE')) { if ($metaconsole_on && $server_name != '') {
$connection = metaconsole_get_connection($server_name); $connection = metaconsole_get_connection($server_name);
if (!metaconsole_load_external_db($connection)) { if (!metaconsole_load_external_db($connection)) {
//ui_print_error_message ("Error connecting to ".$server_name); //ui_print_error_message ("Error connecting to ".$server_name);
@ -627,7 +627,7 @@ function reporting_SLA($report, $content, $type = 'dinamic',
} }
if (modules_is_disable_agent($sla['id_agent_module'])) { if (modules_is_disable_agent($sla['id_agent_module'])) {
if (($config ['metaconsole'] == 1) && defined('METACONSOLE')) { if ($metaconsole_on) {
//Restore db connection //Restore db connection
metaconsole_restore_db(); metaconsole_restore_db();
} }
@ -646,7 +646,7 @@ function reporting_SLA($report, $content, $type = 'dinamic',
$content['time_from'], $content['time_from'],
$content['time_to']); $content['time_to']);
if (($config ['metaconsole'] == 1) && defined('METACONSOLE')) { if ($metaconsole_on) {
//Restore db connection //Restore db connection
metaconsole_restore_db(); metaconsole_restore_db();
} }
@ -681,7 +681,7 @@ function reporting_SLA($report, $content, $type = 'dinamic',
$server_name = $sla ['server_name']; $server_name = $sla ['server_name'];
//Metaconsole connection //Metaconsole connection
if (($config ['metaconsole'] == 1) && ($server_name != '') && defined('METACONSOLE')) { if ($metaconsole_on && $server_name != '') {
$connection = metaconsole_get_connection($server_name); $connection = metaconsole_get_connection($server_name);
if (metaconsole_connect($connection) != NOERR) { if (metaconsole_connect($connection) != NOERR) {
continue; continue;
@ -774,13 +774,11 @@ function reporting_SLA($report, $content, $type = 'dinamic',
$return['charts'][] = $dataslice; $return['charts'][] = $dataslice;
} }
if ($config ['metaconsole'] == 1 && defined('METACONSOLE')) { if ($metaconsole_on) {
//Restore db connection //Restore db connection
metaconsole_restore_db(); metaconsole_restore_db();
} }
} }
} }
return reporting_check_structure_content($return); return reporting_check_structure_content($return);