diff options
| author | doktornotor <notordoktor@gmail.com> | 2017-02-22 14:36:26 +0100 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2017-04-03 15:45:25 -0400 |
| commit | 6df0114b5bcba0fb8aaed3546fb054b0b9162998 (patch) | |
| tree | e740a04acb39a8fc133315f1c8e80bb2e228ae4a | |
| parent | 9a6e29827fbf4af274dfd95a35dd776608cb88f2 (diff) | |
| download | pfsense-6df0114b5bcba0fb8aaed3546fb054b0b9162998.zip pfsense-6df0114b5bcba0fb8aaed3546fb054b0b9162998.tar.gz | |
vslb.inc - Add missing include, use sigkillbyname()
| -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 7c1ff17..1573842 100644 --- a/src/etc/inc/vslb.inc +++ b/src/etc/inc/vslb.inc @@ -179,6 +179,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']; @@ -382,7 +383,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"); @@ -398,7 +399,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("*"); } |
