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

Revert "bug: fail isPingable if fping errors" (#7496)

Browse Source 
* Revert "fix: Fixed clickatell alert transport (#7446)"

This reverts commit 9774acd055.

* Revert "newdevice: Added support for Eaton ATS devices (#7448)"

This reverts commit 1318e5871c.

* Revert "newdevice: Updated Zhone MXK detection (#7488)"

This reverts commit 81667b9e20.

* Revert "docs: Added HipChat V2 WebUI Config Example (#7486)"

This reverts commit a31eaa9839.

* Revert "fix: Fail isPingable if fping errors (#7426)"

This reverts commit 1998845f06.
This commit is contained in:
Neil Lathwood
2017-10-16 11:56:47 +01:00
committed by GitHub
parent 9774acd055
commit cdf31c47e1
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/functions.php
+2 -3
View File
@@ -604,7 +604,7 @@ function isPingable($hostname, $address_family = AF_INET, $attribs = array())
$fping_params .= ' -p ' . $config['fping_options']['millisec'];
}
$status = fping($hostname, $fping_params, $address_family);
if ($status['exitcode'] > 0 || $status['loss'] == 100) {
if ($status['loss'] == 100) {
$response['result'] = false;
} else {
$response['result'] = true;
@@ -1365,7 +1365,6 @@ function fping($host, $params, $address_family = AF_INET)
$read .= fgets($pipes[1], 1024);
}
fclose($pipes[1]);
$proc_status = proc_get_status($process);
proc_close($process);
}
@@ -1385,7 +1384,7 @@ function fping($host, $params, $address_family = AF_INET)
$min = set_numeric($min);
$max = set_numeric($max);
$avg = set_numeric($avg);
$response = array('xmt'=>$xmt,'rcv'=>$rcv,'loss'=>$loss,'min'=>$min,'max'=>$max,'avg'=>$avg,'exitcode'=>$proc_status['exitcode']);
$response = array('xmt'=>$xmt,'rcv'=>$rcv,'loss'=>$loss,'min'=>$min,'max'=>$max,'avg'=>$avg);
return $response;
}