summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authordoktornotor <notordoktor@gmail.com>2017-02-22 14:36:26 +0100
committerGitHub <noreply@github.com>2017-02-22 14:36:26 +0100
commitf38f83cdac1db9fcc2f5815167bdeaa879a05752 (patch)
tree2d12f256a035d76835d2dacbd28676b9b37e4416 /src
parentaba748830d69b05df8c4a4cee370413c91c32273 (diff)
downloadpfsense-f38f83cdac1db9fcc2f5815167bdeaa879a05752.zip
pfsense-f38f83cdac1db9fcc2f5815167bdeaa879a05752.tar.gz
vslb.inc - Add missing include, use sigkillbyname()
Diffstat (limited to 'src')
-rw-r--r--src/etc/inc/vslb.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/etc/inc/vslb.inc b/src/etc/inc/vslb.inc
index 7d59cb1..d901b86 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("*");
}
OpenPOWER on IntegriCloud