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 all unneeded if($debug)-statements and replace them with d_echo

Browse Source
This commit is contained in:
Mark Schouten
2015-08-20 15:02:40 +02:00
parent e0edeab13f
commit 55a2e0423d
24 changed files with 47 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
includes/polling/bgp-peers.inc.php
View File

@@ -1,8 +1,5 @@
<?php
// We should walk, so we can discover here too.
global $debug;
if ($config['enable_bgp']) {
foreach (dbFetchRows('SELECT * FROM bgpPeers WHERE device_id = ?', array($device['device_id'])) as $peer) {
// Poll BGP Peer
@@ -105,16 +102,12 @@ if ($config['enable_bgp']) {
$peer_cmd .= ' jnxBgpM2PeerInUpdatesElapsedTime.0.ipv6.'.$junos_v6[$peer_ip];
$peer_cmd .= ' jnxBgpM2PeerLocalAddr.0.ipv6.'.$junos_v6[$peer_ip];
$peer_cmd .= '|grep -v "No Such Instance"';
if ($debug) {
echo "\n$peer_cmd\n";
}
d_echo("\n$peer_cmd\n");
$peer_data = trim(`$peer_cmd`);
list($bgpPeerState, $bgpPeerAdminStatus, $bgpPeerInUpdates, $bgpPeerOutUpdates, $bgpPeerInTotalMessages, $bgpPeerOutTotalMessages, $bgpPeerFsmEstablishedTime, $bgpPeerInUpdateElapsedTime, $bgpLocalAddr) = explode("\n", $peer_data);
if ($debug) {
echo "State = $bgpPeerState - AdminStatus: $bgpPeerAdminStatus\n";
}
d_echo("State = $bgpPeerState - AdminStatus: $bgpPeerAdminStatus\n");
$bgpLocalAddr = str_replace('"', '', str_replace(' ', '', $bgpLocalAddr));
if ($bgpLocalAddr == '00000000000000000000000000000000') {
@@ -175,9 +168,7 @@ if ($config['enable_bgp']) {
foreach ($peer_afis as $peer_afi) {
$afi = $peer_afi['afi'];
$safi = $peer_afi['safi'];
if ($debug) {
echo "$afi $safi\n";
}
d_echo("$afi $safi\n");
if ($device['os_group'] == 'cisco') {
$bgp_peer_ident = ipv62snmp($peer['bgpPeerIdentifier']);
@@ -230,9 +221,7 @@ if ($config['enable_bgp']) {
$cbgp_data .= "$v\n";
}
if ($debug) {
echo "$cbgp_data\n";
}
d_echo("$cbgp_data\n");
}
else {
// FIXME - move to function
@@ -246,15 +235,11 @@ if ($config['enable_bgp']) {
$cbgp_cmd .= ' cbgpPeerSuppressedPrefixes.'.$peer['bgpPeerIdentifier'].".$afi.$safi";
$cbgp_cmd .= ' cbgpPeerWithdrawnPrefixes.'.$peer['bgpPeerIdentifier'].".$afi.$safi";
if ($debug) {
echo "$cbgp_cmd\n";
}
d_echo("$cbgp_cmd\n");
$cbgp_data = preg_replace('/^OID.*$/', '', trim(`$cbgp_cmd`));
$cbgp_data = preg_replace('/No Such Instance currently exists at this OID/', '0', $cbgp_data);
if ($debug) {
echo "$cbgp_data\n";
}
d_echo("$cbgp_data\n");
}//end if
list($cbgpPeerAcceptedPrefixes,$cbgpPeerDeniedPrefixes,$cbgpPeerPrefixAdminLimit,$cbgpPeerPrefixThreshold,$cbgpPeerPrefixClearThreshold,$cbgpPeerAdvertisedPrefixes,$cbgpPeerSuppressedPrefixes,$cbgpPeerWithdrawnPrefixes) = explode("\n", $cbgp_data);
}//end if