diff options
author | Ermal <eri@pfsense.org> | 2010-07-20 19:57:36 +0000 |
---|---|---|
committer | Ermal <eri@pfsense.org> | 2010-07-20 19:58:16 +0000 |
commit | 20f26a504328fd3973da6b40b3991bb077fbd941 (patch) | |
tree | c82ac1b4b4fbfbbfd1e89646d1bb0d81281f16e3 /etc | |
parent | 1a8bf19a68b0a87fe7a9716a7c978ab8d2cdb616 (diff) | |
download | pfsense-20f26a504328fd3973da6b40b3991bb077fbd941.zip pfsense-20f26a504328fd3973da6b40b3991bb077fbd941.tar.gz |
Do not try to reload apinger config but always kill the running process and start a new one so it behaves.
Diffstat (limited to 'etc')
-rw-r--r-- | etc/inc/gwlb.inc | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/etc/inc/gwlb.inc b/etc/inc/gwlb.inc index 94ddd17..eda0b06 100644 --- a/etc/inc/gwlb.inc +++ b/etc/inc/gwlb.inc @@ -235,16 +235,13 @@ EOD; fwrite($fd, $apingerconfig); fclose($fd); - if (is_process_running("apinger")) { - sigkillbypid("{$g['varrun_path']}/apinger.pid", "HUP"); - } else { - if (is_dir("{$g['tmp_path']}")) - chmod("{$g['tmp_path']}", 01777); - if (is_dir("{$g['vardb_path']}/rrd")) - chown("{$g['vardb_path']}/rrd", "nobody"); - /* start a new apinger process */ - mwexec_bg("/usr/local/sbin/apinger -c {$g['varetc_path']}/apinger.conf"); - } + killbypid("{$g['varrun_path']}/apinger.pid"); + if (is_dir("{$g['tmp_path']}")) + chmod("{$g['tmp_path']}", 01777); + if (is_dir("{$g['vardb_path']}/rrd")) + chown("{$g['vardb_path']}/rrd", "nobody"); + /* start a new apinger process */ + mwexec_bg("/usr/local/sbin/apinger -c {$g['varetc_path']}/apinger.conf"); return 0; } |