diff options
| author | jim-p <jimp@pfsense.org> | 2011-09-28 11:38:05 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2011-09-28 11:40:21 -0400 |
| commit | 240ffd2e7e748f0074d572756cd40bb272b29451 (patch) | |
| tree | dedc9a0a20c7dc293799640ef2da8add7d1b363c /etc/inc | |
| parent | e3522ebf9579aa35f269fffb7e90b3c8f5adb091 (diff) | |
| download | pfsense-240ffd2e7e748f0074d572756cd40bb272b29451.zip pfsense-240ffd2e7e748f0074d572756cd40bb272b29451.tar.gz | |
Add relayd to Status > Services and widget. Add capability to kill when restarting instead of a simple reload. Implements #1913
Diffstat (limited to 'etc/inc')
| -rw-r--r-- | etc/inc/vslb.inc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/etc/inc/vslb.inc b/etc/inc/vslb.inc index 54416b9..064438e 100644 --- a/etc/inc/vslb.inc +++ b/etc/inc/vslb.inc @@ -159,7 +159,7 @@ function echo_lbaction($action) { return $ret; } -function relayd_configure() { +function relayd_configure($kill_first=false) { global $config, $g; $vs_a = $config['load_balancer']['virtual_server']; @@ -281,8 +281,13 @@ function relayd_configure() { if (is_process_running('relayd')) { if (! empty($vs_a)) { - // it's running and there is a config, just reload - mwexec("/usr/local/sbin/relayctl reload"); + if ($kill_first) { + mwexec('pkill relayd'); + mwexec("/usr/local/sbin/relayd -f {$g['varetc_path']}/relayd.conf"); + } else { + // it's running and there is a config, just reload + mwexec("/usr/local/sbin/relayctl reload"); + } } else { /* * XXX: Something breaks our control connection with relayd |
