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

Tidy up debug vs. non-debug output

Browse Source
This commit is contained in:
Paul Gear
2015-06-13 22:54:40 +10:00
parent 0e17cd967f
commit da346c3a35
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
includes/polling/functions.inc.php
View File

@@ -364,7 +364,6 @@ function rrd_create_update($device, $name, $def, $val, $step = 300)
if (!is_file($rrd) && $def != null) {
// add the --step and the rra definitions to the array
$newdef = "--step $step ".implode(' ', $def).$config['rrd_rra'];
d_echo("Creating RRD $rrd: $newdef");
rrdtool_create($rrd, $newdef);
}

4
includes/polling/mib.inc.php
View File

@@ -11,10 +11,12 @@
* the source code distribution for details.
*/
d_echo("MIB-based polling");
echo("MIB-based polling");
d_echo("\n", ": ");
$devicemib = array($device['sysObjectID'] => "all");
poll_mibs($devicemib, $device, $graphs);
d_echo("Done MIB-based polling");
echo("\n");
?>

10
includes/snmp.inc.php
View File

@@ -944,17 +944,17 @@ function snmp_translate($oid, $module, $mibdir = null)
$lines = preg_split('/\n+/', shell_exec($cmd));
if (!$lines) {
d_echo("No results from snmptranslate");
d_echo("No results from snmptranslate\n");
return null;
}
$matches = array();
if (!preg_match('/(.*)::(.*)/', $lines[0], $matches)) {
d_echo("This doesn't look like a MIB: ".$lines[0]);
d_echo("This doesn't look like a MIB: $lines[0]\n");
return null;
}
d_echo("SNMP translated: $module::$oid -> $matches[1]::$matches[2]");
d_echo("SNMP translated: $module::$oid -> $matches[1]::$matches[2]\n");
return array($matches[1], $matches[2]);
}
@@ -1071,7 +1071,7 @@ function save_mibs($device, $mibname, $oids, $mibdef, &$graphs)
function poll_mibs($list, $device, &$graphs)
{
if (!is_dev_attrib_enabled($device, "poll_mib")) {
d_echo("MIB module disabled for ".$device['hostname']);
d_echo("MIB module disabled for ".$device['hostname']."\n");
return;
}
$mibdefs = array();
@@ -1085,7 +1085,7 @@ function poll_mibs($list, $device, &$graphs)
save_mibs($device, $nam, $oids, $mibdefs[$nam], $graphs);
}
else {
d_echo("MIB: no match for $module::$name");
d_echo("MIB: no match for $module::$name\n");
}
}
}