mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ospf moar cleanup

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2218 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2011-05-02 15:18:46 +00:00
parent eb2d53bec1
commit f2890e2de0
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
includes/polling/ospf.inc.php
View File

@ -27,16 +27,17 @@ foreach ($ospf_instances_poll as $ospf_instance_id => $ospf_entry)
if (!isset($ospf_instances_db[$ospf_instance_id])) if (!isset($ospf_instances_db[$ospf_instance_id]))
{ {
$query = "INSERT INTO `ospf_instances` (`device_id`, `ospf_instance_id`) VALUES ('".$device['device_id']."','".$ospf_instance_id."')"; $query = "INSERT INTO `ospf_instances` (`device_id`, `ospf_instance_id`) VALUES ('".$device['device_id']."','".$ospf_instance_id."')";
echo($query); if ($debug) { echo($query); }
mysql_query($query); mysql_query($query);
echo(mysql_error()); if ($debug) { echo(mysql_error()); }
echo("+"); echo("+");
$entry = mysql_fetch_assoc(mysql_query("SELECT * FROM `ospf_instances` WHERE `device_id` = '".$device['device_id']."' AND `ospf_instance_id` = '".$ospf_instance_id."'")); $entry = mysql_fetch_assoc(mysql_query("SELECT * FROM `ospf_instances` WHERE `device_id` = '".$device['device_id']."' AND `ospf_instance_id` = '".$ospf_instance_id."'"));
$ospf_instances_db[$entry['ospf_instance_id']] = $entry; $ospf_instances_db[$entry['ospf_instance_id']] = $entry;
} }
} }
if ($debug) { if ($debug)
{
echo("\nPolled: "); echo("\nPolled: ");
print_r($ospf_instances_poll); print_r($ospf_instances_poll);
echo("Database: "); echo("Database: ");
@ -61,14 +62,15 @@ if (is_array($ospf_instances_db))
if ($ospf_instance_update) if ($ospf_instance_update)
{ {
$query = "UPDATE `ospf_instances` SET `ospf_instance_id` = '".$ospf_instance_db['ospf_instance_id']."'".$ospf_instance_update." WHERE `device_id` = '".$device['device_id']."' AND `ospf_instance_id` = '".$ospf_instance_id."'"; $query = "UPDATE `ospf_instances` SET `ospf_instance_id` = '".$ospf_instance_db['ospf_instance_id']."'".$ospf_instance_update." WHERE `device_id` = '".$device['device_id']."' AND `ospf_instance_id` = '".$ospf_instance_id."'";
if ($debug) {echo($query);} ## Debug if ($debug) { echo($query); }
mysql_query($query); mysql_query($query);
if ($debug) {echo(mysql_error());} ## Debug if ($debug) { echo(mysql_error()); }
echo("U"); echo("U");
unset($ospf_instance_update); unset($ospf_instance_update);
} else { } else {
echo("."); echo(".");
} }
unset($ospf_instance_poll); unset($ospf_instance_poll);
unset($ospf_instance_db); unset($ospf_instance_db);
$ospf_instance_count++; $ospf_instance_count++;
@ -104,7 +106,8 @@ foreach ($ospf_areas_poll as $ospf_area_id => $ospf_area)
} }
} }
if ($debug) { if ($debug)
{
echo("\nPolled: "); echo("\nPolled: ");
print_r($ospf_areas_poll); print_r($ospf_areas_poll);
echo("Database: "); echo("Database: ");
@ -296,7 +299,7 @@ if (is_array($ospf_nbrs_db))
foreach ($ospf_nbr_oids as $oid) foreach ($ospf_nbr_oids as $oid)
{ // Loop the OIDs { // Loop the OIDs
echo($ospf_nbr_db[$oid]."|".$ospf_nbr_poll[$oid]."\n"); if ($debug) { echo($ospf_nbr_db[$oid]."|".$ospf_nbr_poll[$oid]."\n"); }
if ($ospf_nbr_db[$oid] != $ospf_nbr_poll[$oid]) if ($ospf_nbr_db[$oid] != $ospf_nbr_poll[$oid])
{ // If data has changed, build a query { // If data has changed, build a query
$ospf_nbr_update .= ", `$oid` = '".mres($ospf_nbr_poll[$oid])."'"; $ospf_nbr_update .= ", `$oid` = '".mres($ospf_nbr_poll[$oid])."'";