diff options
| author | jim-p <jimp@pfsense.org> | 2017-04-03 15:45:12 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2017-04-03 15:45:12 -0400 |
| commit | 4572c625a577c5a5ef7aa3cf3c4846a9e064e55f (patch) | |
| tree | 07f16022fae2abfadf584b196fe4a45e71818bdd /src | |
| parent | c30cb0ce05938bf3ea3d285e3291de097c9c8347 (diff) | |
| parent | f38f83cdac1db9fcc2f5815167bdeaa879a05752 (diff) | |
| download | pfsense-4572c625a577c5a5ef7aa3cf3c4846a9e064e55f.zip pfsense-4572c625a577c5a5ef7aa3cf3c4846a9e064e55f.tar.gz | |
Merge pull request #3569 from doktornotor/patch-8
Diffstat (limited to 'src')
| -rw-r--r-- | src/etc/inc/vslb.inc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/etc/inc/vslb.inc b/src/etc/inc/vslb.inc index 7c759de..da52adb 100644 --- a/src/etc/inc/vslb.inc +++ b/src/etc/inc/vslb.inc @@ -147,6 +147,7 @@ function relayd_configure($kill_first=false) { if (!function_exists('filter_expand_alias_array')) { require_once("filter.inc"); } + require_once("util.inc"); $vs_a = $config['load_balancer']['virtual_server']; $pool_a = $config['load_balancer']['lbpool']; @@ -350,7 +351,7 @@ function relayd_configure($kill_first=false) { if (is_process_running('relayd')) { if (!empty($vs_a)) { if ($kill_first) { - mwexec('pkill relayd'); + sigkillbyname("relayd", "TERM"); /* Remove all active relayd anchors now that relayd is no longer running. */ cleanup_lb_anchor("*"); mwexec("/usr/local/sbin/relayd -f {$g['varetc_path']}/relayd.conf"); @@ -366,7 +367,7 @@ function relayd_configure($kill_first=false) { * mwexec('/usr/local/sbin/relayctl stop'); * returns "command failed" */ - mwexec('pkill relayd'); + sigkillbyname("relayd", "TERM"); /* Remove all active relayd anchors now that relayd is no longer running. */ cleanup_lb_anchor("*"); } |
