summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormicmac1 <sebastian_ml@gmx.net>2018-08-05 15:09:17 +0200
committerGitHub <noreply@github.com>2018-08-05 15:09:17 +0200
commit7fbb94503fd29059ca5497f4892e1558a370370f (patch)
treeb2c92decebdf3a9456f972492fda57d6992e2160
parent88b12368f11f3feeefcd4dcbe54f21159b8356c1 (diff)
parent53b5b75af1101444250a7e1f76e75af9c482a440 (diff)
Merge pull request #359 from micmac1/fs-sigkill-openwrt-18.06
freeswitch-stable: add SIGKILL to init script
-rw-r--r--net/freeswitch-stable/Makefile2
-rw-r--r--net/freeswitch-stable/files/freeswitch.init11
2 files changed, 11 insertions, 2 deletions
diff --git a/net/freeswitch-stable/Makefile b/net/freeswitch-stable/Makefile
index c416b60..991f123 100644
--- a/net/freeswitch-stable/Makefile
+++ b/net/freeswitch-stable/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PRG_NAME:=freeswitch
PKG_NAME:=$(PRG_NAME)-stable
PKG_VERSION:=1.6.20
-PKG_RELEASE:=8
+PKG_RELEASE:=9
PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net>
PKG_SOURCE:=$(PRG_NAME)-$(PKG_VERSION).tar.xz
diff --git a/net/freeswitch-stable/files/freeswitch.init b/net/freeswitch-stable/files/freeswitch.init
index c17768c..a46df7d 100644
--- a/net/freeswitch-stable/files/freeswitch.init
+++ b/net/freeswitch-stable/files/freeswitch.init
@@ -1,5 +1,5 @@
#!/bin/sh /etc/rc.common
-# Copyright (C) 2017 OpenWrt.org
+# Copyright (C) 2017 - 2018 OpenWrt.org
START=90
@@ -124,6 +124,15 @@ stop_service() {
done
[ $retval -ne 1 ] && {
+ $LOGGER Application seems to hang
+ $LOGGER Sending SIGKILL
+ kill -SIGKILL $mypid 2>/dev/null
+ sleep 3
+ pgrep $FS | grep -w $mypid &>/dev/null
+ retval=$?
+ }
+
+ [ $retval -ne 1 ] && {
$LOGGER Failed to stop $FS
exit 1
}