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

gateways: always restart apinger, HUP doesn't work

Browse Source
This commit is contained in:
Franco Fichtner 2016-11-09 17:10:54 +01:00
parent a000c8e041
commit 5d60cd1f29
2 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,20 +42,13 @@ function return_apinger_defaults()
);
}
function setup_gateways_monitor_full()
{
killbypid('/var/run/apinger.pid');
setup_gateways_monitor();
}
/*
* Creates monitoring configuration file and
* adds appropriate static routes.
*/
function setup_gateways_monitor()
{
global $config;
killbypid('/var/run/apinger.pid', 'TERM', true);
@unlink('/var/run/apinger.status');
@mkdir('/var/db/rrd', 0775);
@chown('/var/db/rrd', 'nobody');
@ -380,27 +373,11 @@ EOD;
$gateways_arr = return_gateways_array();
if (!is_array($gateways_arr)) {
log_error("No gateways to monitor. Apinger will not be run.");
killbypid('/var/run/apinger.pid');
@unlink('/var/run/apinger.status');
return;
}
@file_put_contents('/var/etc/apinger.conf', $apingerconfig);
unset($apingerconfig);
/* Restart apinger process */
if (isvalidpid('/var/run/apinger.pid')) {
killbypid('/var/run/apinger.pid', 'HUP');
} else {
/* start a new apinger process */
@unlink('/var/run/apinger.status');
sleep(1);
mwexec_bg('/usr/local/sbin/apinger -c /var/etc/apinger.conf');
sleep(1);
killbypid('/var/run/apinger.pid', 'USR1');
}
return 0;
file_put_contents('/var/etc/apinger.conf', $apingerconfig);
mwexec_bg('/usr/local/sbin/apinger -c /var/etc/apinger.conf');
}
/* return the status of the apinger targets as a array */
@ -412,6 +389,7 @@ function return_gateways_status($byname = false)
/* 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');
}

2
src/etc/inc/services.inc
View File

@ -2471,7 +2471,7 @@ function services_get()
$pconfig = array();
$pconfig['name'] = "apinger";
$pconfig['description'] = gettext("Gateway Monitoring Daemon");
$pconfig['php']['restart'] = array('setup_gateways_monitor_full');
$pconfig['php']['restart'] = array('setup_gateways_monitor');
$pconfig['php']['start'] = array('setup_gateways_monitor');
$pconfig['pidfile'] = '/var/run/apinger.pid';
$services[] = $pconfig;