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

fix the last discovery function to use the by-reference array, toner

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@1198 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2010-06-17 14:26:30 +00:00
parent 2da9a05a00
commit 0bcea700cc
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
includes/discovery/functions.inc.php
View File

@@ -332,7 +332,7 @@ function discover_current(&$valid, $device, $oid, $index, $type, $descr, $precis
return $return; return $return;
} }
function discover_toner($device, $oid, $index, $type, $descr, $capacity = NULL, $current = NULL) function discover_toner(&$valid, $device, $oid, $index, $type, $descr, $capacity = NULL, $current = NULL)
{ {
global $config, $debug; global $config, $debug;
@@ -359,6 +359,7 @@ function discover_toner($device, $oid, $index, $type, $descr, $capacity = NULL,
} }
} }
$valid[$type][$index] = 1;
return $return; return $return;
} }

11
includes/discovery/toner.inc.php
View File

@@ -9,6 +9,8 @@ $community = $device['community'];
$snmpver = $device['snmpver']; $snmpver = $device['snmpver'];
$port = $device['port']; $port = $device['port'];
$valid_toner = array();
echo("Toner : "); echo("Toner : ");
if ($device['os'] == "dell-laser") if ($device['os'] == "dell-laser")
@@ -34,8 +36,7 @@ if ($device['os'] == "dell-laser")
$capacity = snmp_get($device, $capacity_oid, "-Oqv"); $capacity = snmp_get($device, $capacity_oid, "-Oqv");
$current = $current / $capacity * 100; $current = $current / $capacity * 100;
$type = "dell-laser"; $type = "dell-laser";
echo discover_toner($device, $toner_oid, $index, $type, $descr, $capacity, $current); echo discover_toner($valid_toner,$device, $toner_oid, $index, $type, $descr, $capacity, $current);
$toner_exists[$type][$index] = 1;
} }
} }
} }
@@ -43,7 +44,7 @@ if ($device['os'] == "dell-laser")
## Delete removed toners ## Delete removed toners
if($debug) { echo("\n Checking ... \n"); print_r($toner_exists); } if($debug) { echo("\n Checking ... \n"); print_r($valid_toner); }
$sql = "SELECT * FROM toner WHERE device_id = '".$device['device_id']."'"; $sql = "SELECT * FROM toner WHERE device_id = '".$device['device_id']."'";
if ($query = mysql_query($sql)) if ($query = mysql_query($sql))
@@ -52,7 +53,7 @@ if ($query = mysql_query($sql))
{ {
$toner_index = $test_toner['toner_index']; $toner_index = $test_toner['toner_index'];
$toner_type = $test_toner['toner_type']; $toner_type = $test_toner['toner_type'];
if(!$toner_exists[$toner_type][$toner_index]) { if(!$valid_toner[$toner_type][$toner_index]) {
echo("-"); echo("-");
mysql_query("DELETE FROM `toner` WHERE toner_id = '" . $test_toner['toner_id'] . "'"); mysql_query("DELETE FROM `toner` WHERE toner_id = '" . $test_toner['toner_id'] . "'");
} }
@@ -61,7 +62,7 @@ if ($query = mysql_query($sql))
unset($toner_exists); echo("\n"); unset($valid_toner); echo("\n");
} # if ($config['enable_printers']) } # if ($config['enable_printers'])
?> ?>