lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-14 16:44:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

gateways: only force apinger status if running

Browse Source
This commit is contained in:
Franco Fichtner 2017-05-14 06:40:50 +02:00
parent c39ea487c8
commit 89d73f6916
1 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/etc/inc/gwlb.inc
View File

@ -393,31 +393,33 @@ function return_gateways_status($byname = false)
{
global $config;
$apingerstatus = array();
/* Always get the latest status from apinger */
killbypid('/var/run/apinger.pid', 'USR1');
/* we may read the wrong file here as it's async: */
if (file_exists('/var/run/apinger.status')) {
$apingerstatus = file('/var/run/apinger.status');
}
$status = array();
foreach ($apingerstatus as $line) {
$info = explode('|', $line);
if ($byname == false) {
$target = $info[0];
} else {
$target = $info[2];
}
$status[$target] = array();
$status[$target]['monitorip'] = $info[0];
$status[$target]['srcip'] = $info[1];
$status[$target]['name'] = $info[2];
$status[$target]['delay'] = sprintf('%0.1f ms', empty($info[6]) ? 0.0 : round($info[6], 1));
$status[$target]['loss'] = sprintf('%0.1f %%', empty($info[7]) ? 0.0 : round($info[7], 1));
$status[$target]['status'] = trim($info[8]);
if (isvalidpid('/var/run/apinger.pid')) {
/* always get the latest status from apinger */
killbypid('/var/run/apinger.pid', 'USR1');
/* we may read the wrong file here as it's async: */
if (file_exists('/var/run/apinger.status')) {
$apingerstatus = file('/var/run/apinger.status');
foreach ($apingerstatus as $line) {
$info = explode('|', $line);
if ($byname == false) {
$target = $info[0];
} else {
$target = $info[2];
}
$status[$target] = array();
$status[$target]['monitorip'] = $info[0];
$status[$target]['srcip'] = $info[1];
$status[$target]['name'] = $info[2];
$status[$target]['delay'] = sprintf('%0.1f ms', empty($info[6]) ? 0.0 : round($info[6], 1));
$status[$target]['loss'] = sprintf('%0.1f %%', empty($info[7]) ? 0.0 : round($info[7], 1));
$status[$target]['status'] = trim($info[8]);
}
}
}
/* tack on any gateways that have monitoring disabled