diff options
| author | Ermal <eri@pfsense.org> | 2013-08-02 14:04:10 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2013-08-02 14:04:24 +0000 |
| commit | cb9799d5df52ea808191b61145debb4cc2ce73f4 (patch) | |
| tree | b0dee6a3b05da0d5a314789337662b9400beddfe | |
| parent | e2967ba637e67f8dd3a264fda87b3fd52358c178 (diff) | |
| download | pfsense-cb9799d5df52ea808191b61145debb4cc2ce73f4.zip pfsense-cb9799d5df52ea808191b61145debb4cc2ce73f4.tar.gz | |
Reload apinger now that we can rather than restarting. Related to Ticket #3119
| -rw-r--r-- | etc/inc/gwlb.inc | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/etc/inc/gwlb.inc b/etc/inc/gwlb.inc index 3f9e1fe..17a0d20 100644 --- a/etc/inc/gwlb.inc +++ b/etc/inc/gwlb.inc @@ -240,7 +240,6 @@ EOD; @file_put_contents("{$g['varetc_path']}/apinger.conf", $apingerconfig); unset($apingerconfig); - killbypid("{$g['varrun_path']}/apinger.pid"); if (is_dir("{$g['tmp_path']}")) chmod("{$g['tmp_path']}", 01777); if (!is_dir("{$g['vardb_path']}/rrd")) @@ -248,12 +247,16 @@ EOD; @chown("{$g['vardb_path']}/rrd", "nobody"); - /* start a new apinger process */ - @unlink("{$g['varrun_path']}/apinger.status"); - sleep(1); - mwexec_bg("/usr/local/sbin/apinger -c {$g['varetc_path']}/apinger.conf"); - sleep(1); - sigkillbypid("{$g['varrun_path']}/apinger.pid", "USR1"); + if (isvalidpid("{$g['varrun_path']}/apinger.pid")) + sigkillbypid("{$g['varrun_path']}/apinger.pid", "HUP"); + else { + /* start a new apinger process */ + @unlink("{$g['varrun_path']}/apinger.status"); + sleep(1); + mwexec_bg("/usr/local/sbin/apinger -c {$g['varetc_path']}/apinger.conf"); + sleep(1); + sigkillbypid("{$g['varrun_path']}/apinger.pid", "USR1"); + } return 0; } |
