Browse Source

pkg/kamailio/deb: wait for kamailio to exit before returning on sysvinit stop action

We should not return until the service has been fully terminated,
otherwise a subsequent start might break as it can consider itself
as already running. And once the old instance stops there's nothing
left running.

This also makes it possibe to remove a sleep in the restart action.
Guillem Jover 7 năm trước cách đây
mục cha
commit
4cc60ede96

+ 1 - 2
pkg/kamailio/deb/buster/kamailio.init

@@ -137,7 +137,7 @@ case "$1" in
   stop)
 	log_daemon_msg "Stopping $DESC: $NAME"
 	start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE \
-		--exec $DAEMON
+		--exec $DAEMON --retry 5
 	log_end_msg 0
 	;;
   restart|force-reload)
@@ -145,7 +145,6 @@ case "$1" in
 	create_radius_seqfile
 
 	$0 stop
-	sleep 1
 	$0 start
 	;;
   status)

+ 1 - 2
pkg/kamailio/deb/debian/kamailio.init

@@ -137,7 +137,7 @@ case "$1" in
   stop)
 	log_daemon_msg "Stopping $DESC: $NAME"
 	start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE \
-		--exec $DAEMON
+		--exec $DAEMON --retry 5
 	log_end_msg 0
 	;;
   restart|force-reload)
@@ -145,7 +145,6 @@ case "$1" in
 	create_radius_seqfile
 
 	$0 stop
-	sleep 1
 	$0 start
 	;;
   status)

+ 1 - 2
pkg/kamailio/deb/jessie/kamailio.init

@@ -137,7 +137,7 @@ case "$1" in
   stop)
 	log_daemon_msg "Stopping $DESC: $NAME"
 	start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE \
-		--exec $DAEMON
+		--exec $DAEMON --retry 5
 	log_end_msg 0
 	;;
   restart|force-reload)
@@ -145,7 +145,6 @@ case "$1" in
 	create_radius_seqfile
 
 	$0 stop
-	sleep 1
 	$0 start
 	;;
   status)

+ 1 - 2
pkg/kamailio/deb/precise/kamailio.init

@@ -137,7 +137,7 @@ case "$1" in
   stop)
 	log_daemon_msg "Stopping $DESC: $NAME"
 	start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE \
-		--exec $DAEMON
+		--exec $DAEMON --retry 5
 	log_end_msg 0
 	;;
   restart|force-reload)
@@ -145,7 +145,6 @@ case "$1" in
 	create_radius_seqfile
 
 	$0 stop
-	sleep 1
 	$0 start
 	;;
   status)

+ 1 - 2
pkg/kamailio/deb/sid/kamailio.init

@@ -137,7 +137,7 @@ case "$1" in
   stop)
 	log_daemon_msg "Stopping $DESC: $NAME"
 	start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE \
-		--exec $DAEMON
+		--exec $DAEMON --retry 5
 	log_end_msg 0
 	;;
   restart|force-reload)
@@ -145,7 +145,6 @@ case "$1" in
 	create_radius_seqfile
 
 	$0 stop
-	sleep 1
 	$0 start
 	;;
   status)

+ 1 - 2
pkg/kamailio/deb/stretch/kamailio.init

@@ -137,7 +137,7 @@ case "$1" in
   stop)
 	log_daemon_msg "Stopping $DESC: $NAME"
 	start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE \
-		--exec $DAEMON
+		--exec $DAEMON --retry 5
 	log_end_msg 0
 	;;
   restart|force-reload)
@@ -145,7 +145,6 @@ case "$1" in
 	create_radius_seqfile
 
 	$0 stop
-	sleep 1
 	$0 start
 	;;
   status)

+ 1 - 2
pkg/kamailio/deb/trusty/kamailio.init

@@ -137,7 +137,7 @@ case "$1" in
   stop)
 	log_daemon_msg "Stopping $DESC: $NAME"
 	start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE \
-		--exec $DAEMON
+		--exec $DAEMON --retry 5
 	log_end_msg 0
 	;;
   restart|force-reload)
@@ -145,7 +145,6 @@ case "$1" in
 	create_radius_seqfile
 
 	$0 stop
-	sleep 1
 	$0 start
 	;;
   status)

+ 1 - 2
pkg/kamailio/deb/wheezy/kamailio.init

@@ -137,7 +137,7 @@ case "$1" in
   stop)
 	log_daemon_msg "Stopping $DESC: $NAME"
 	start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE \
-		--exec $DAEMON
+		--exec $DAEMON --retry 5
 	log_end_msg 0
 	;;
   restart|force-reload)
@@ -145,7 +145,6 @@ case "$1" in
 	create_radius_seqfile
 
 	$0 stop
-	sleep 1
 	$0 start
 	;;
   status)

+ 1 - 2
pkg/kamailio/deb/xenial/kamailio.init

@@ -137,7 +137,7 @@ case "$1" in
   stop)
 	log_daemon_msg "Stopping $DESC: $NAME"
 	start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE \
-		--exec $DAEMON
+		--exec $DAEMON --retry 5
 	log_end_msg 0
 	;;
   restart|force-reload)
@@ -145,7 +145,6 @@ case "$1" in
 	create_radius_seqfile
 
 	$0 stop
-	sleep 1
 	$0 start
 	;;
   status)