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 scrut issues

Browse Source
This commit is contained in:
laf
2015-06-22 22:55:32 +01:00
parent 820afa6dbb
commit 6c9810fc3c
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
includes/functions.php
View File

@@ -1285,7 +1285,6 @@ $process = proc_open($config['fping'] . ' -e -q ' .$params . ' ' .$host.' 2>&1',
if (is_resource($process)) { if (is_resource($process)) {
fwrite($pipes[0], $in);
/* fwrite writes to stdin, 'cat' will immediately write the data from stdin /* fwrite writes to stdin, 'cat' will immediately write the data from stdin
* to stdout and blocks, when the stdout buffer is full. Then it will not * to stdout and blocks, when the stdout buffer is full. Then it will not
* continue reading from stdin and php will block here. * continue reading from stdin and php will block here.
@@ -1293,16 +1292,15 @@ if (is_resource($process)) {
fclose($pipes[0]); fclose($pipes[0]);
$read = '';
while (!feof($pipes[1])) { while (!feof($pipes[1])) {
$read .= fgets($pipes[1], 1024); $read .= fgets($pipes[1], 1024);
} }
fclose($pipes[1]); fclose($pipes[1]);
$return_value = proc_close($process); proc_close($process);
} }
system("echo 'YEAH $read END\n' >> /tmp/testing");
system("echo '". $config['fping'] ." -e -q $params $host' >> /tmp/testing");
preg_match('/[0-9]+\/[0-9]+\/[0-9]+%/', $read, $loss_tmp); preg_match('/[0-9]+\/[0-9]+\/[0-9]+%/', $read, $loss_tmp);
preg_match('/[0-9\.]+\/[0-9\.]+\/[0-9\.]*$/', $read, $latency); preg_match('/[0-9\.]+\/[0-9\.]+\/[0-9\.]*$/', $read, $latency);
$loss = preg_replace("/%/","",$loss_tmp[0]); $loss = preg_replace("/%/","",$loss_tmp[0]);