From: Sebastian Kemper <sebastian_ml@gmx.net>
Date: Sun, 21 Apr 2019 13:18:46 +0000 (+0200)
Subject: baresip: rely on procd for shutdown
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c6509afd2bb31df156394c50ac3ba4e4c9604564;p=feed%2Ftelephony.git

baresip: rely on procd for shutdown

No need to stop baresip manually. Just let procd handle it.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
---

diff --git a/net/baresip/files/baresip.init b/net/baresip/files/baresip.init
index c18c985..72149be 100644
--- a/net/baresip/files/baresip.init
+++ b/net/baresip/files/baresip.init
@@ -12,7 +12,6 @@ DEFAULT=/etc/default/$DAEMON
 LOGGER="/usr/bin/logger -p user.err -s -t $DAEMON"
 OPTIONS=
 PROG=/usr/bin/$DAEMON
-TIMEOUT=30
 
 [ -f $DEFAULT ] && . $DEFAULT
 
@@ -38,54 +37,3 @@ start_service() {
   procd_set_param user $DAEMON
   procd_close_instance
 }
-
-stop_service() {
-  local retval=
-  local mypid=
-  local timeout=$TIMEOUT
-
-  pgrep $DAEMON &> /dev/null
-  [ $? -ne 0 ] && exit 0
-
-  [ -f /var/run/${DAEMON}.pid ]
-  retval=$?
-
-  # init script could find itself in a scenario where baresip was started
-  # very recently, so make it wait a while for a pid file to appear
-  while [ $retval -ne 0 -a $timeout -gt 0 ]; do
-    sleep 1
-    [ -f /var/run/${DAEMON}.pid ]
-    retval=$?
-    timeout=$(($timeout-1))
-  done
-
-  [ $retval -eq 0 ] || {
-    $LOGGER PID file does not exist
-    exit 1
-  }
-
-  mypid=$(cat /var/run/${DAEMON}.pid)
-
-  [ "$mypid" -gt 1 ] 2> /dev/null || {
-    $LOGGER PID file contains garbage
-    exit 1
-  }
-
-  timeout=$TIMEOUT
-  kill $mypid 2>/dev/null
-  pgrep $DAEMON | grep -w $mypid &>/dev/null
-  retval=$?
-
-  while [ $retval -eq 0 -a $timeout -gt 0 ]; do
-    sleep 10
-    pgrep $DAEMON | grep -w $mypid &>/dev/null
-    retval=$?
-    [ $retval -eq 0 ] && kill $mypid 2>/dev/null
-    timeout=$(($timeout-10))
-  done
-
-  [ $retval -ne 1 ] && {
-    $LOGGER Failed to stop $DAEMON
-    exit 1
-  }
-}