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

Remove redundant code from port-{adsl,etherlike,poe} polling submodules.

Browse Source 
$this_port already gets defined within include/polling/ports.inc.php
  so there's no need to redefine it again in each submodule.

Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>
This commit is contained in:
Maximilian Wilhelm
2016-02-03 21:12:46 +01:00
parent 5521002b37
commit ec5d0dfd89
3 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
includes/polling/port-adsl.inc.php
View File

@@ -39,10 +39,7 @@
// adslAturPerfESs.1 = 0 seconds // adslAturPerfESs.1 = 0 seconds
// adslAturPerfValidIntervals.1 = 0 // adslAturPerfValidIntervals.1 = 0
// adslAturPerfInvalidIntervals.1 = 0 // adslAturPerfInvalidIntervals.1 = 0
if (isset($port_stats[$ifIndex]['adslLineCoding'])) { if (isset($this_port['adslLineCoding'])) {
// Check to make sure Port data is cached.
$this_port = &$port_stats[$ifIndex];
$rrdfile = get_port_rrdfile_path ($device['hostname'], $port_id, 'adsl'); $rrdfile = get_port_rrdfile_path ($device['hostname'], $port_id, 'adsl');
$rrd_create = ' --step 300'; $rrd_create = ' --step 300';

7
includes/polling/port-etherlike.inc.php
View File

@@ -1,11 +1,6 @@
<?php <?php
if ($port_stats[$ifIndex] && if ($this_port['dot3StatsIndex'] and $port['ifType'] == 'ethernetCsmacd') {
$port['ifType'] == 'ethernetCsmacd' &&
isset($port_stats[$ifIndex]['dot3StatsIndex'])) {
// Check to make sure Port data is cached.
$this_port = &$port_stats[$ifIndex];
// TODO: remove legacy check? // TODO: remove legacy check?
$old_rrdfile = $config['rrd_dir'].'/'.$device['hostname'].'/'.safename('etherlike-'.$port['ifIndex'].'.rrd'); $old_rrdfile = $config['rrd_dir'].'/'.$device['hostname'].'/'.safename('etherlike-'.$port['ifIndex'].'.rrd');
$rrd_file = get_port_rrdfile_path ($device['hostname'], $port_id, 'dot3'); $rrd_file = get_port_rrdfile_path ($device['hostname'], $port_id, 'dot3');

7
includes/polling/port-poe.inc.php
View File

@@ -35,12 +35,7 @@ $peth_oids = array(
'pethMainPseConsumptionPower', 'pethMainPseConsumptionPower',
); );
if ($port_stats[$ifIndex] if ($this_port['dot3StatsIndex'] && $port['ifType'] == 'ethernetCsmacd') {
&& $port['ifType'] == 'ethernetCsmacd'
&& isset($port_stats[$ifIndex]['dot3StatsIndex'])) {
// Check to make sure Port data is cached.
$this_port = &$port_stats[$ifIndex];
$rrdfile = get_port_rrdfile_path ($device['hostname'], $port_id, 'poe'); $rrdfile = get_port_rrdfile_path ($device['hostname'], $port_id, 'poe');
if (!file_exists($rrdfile)) { if (!file_exists($rrdfile)) {
$rrd_create .= $config['rrd_rra']; $rrd_create .= $config['rrd_rra'];