[Pkg-voip-commits] [kamailio] 02/05: Use lsb init-functions on init script

[Victor Seva Lopez]

This is an automated email from the git hooks/post-receive script.

maniac-guest pushed a commit to branch master
in repository kamailio.

commit 7760454d3d8895509bacaa5ed32fc88b01686031
Author: Victor Seva <vseva at sipwise.com>
Date:   Tue Aug 20 10:41:14 2013 +0200

    Use lsb init-functions on init script
---
 debian/kamailio.init |   43 +++++++++++++++++--------------------------
 1 file changed, 17 insertions(+), 26 deletions(-)

diff --git a/debian/kamailio.init b/debian/kamailio.init
index 97b4c2c..2e0ca1d 100644
--- a/debian/kamailio.init
+++ b/debian/kamailio.init
@@ -12,6 +12,8 @@
 # Description:       Start the Kamailio SIP proxy server
 ### END INIT INFO
 
+. /lib/lsb/init-functions
+
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/sbin/kamailio
 NAME=kamailio
@@ -31,7 +33,7 @@ DUMP_CORE=no
 check_fork ()
 {
     if grep -q "^[[:space:]]*fork[[:space:]]*=[[:space:]]*no.*" /etc/kamailio/kamailio.cfg; then
-	echo "Not starting $DESC: fork=no specified in config file; run /etc/init.d/kamailio debug instead"
+	log_failure_msg "Not starting $DESC: fork=no specified in config file; run /etc/init.d/kamailio debug instead"
 	exit 0
     fi
 }
@@ -44,10 +46,10 @@ check_kamailio_config ()
 	retcode=$?
 	set -e
 	if [ "$retcode" != '0' ]; then
-	    echo "Not starting $DESC: invalid configuration file!"
-	    echo
-	    echo "$out"
-	    echo
+	    log_failure_msg "Not starting $DESC: invalid configuration file!"
+	    log_failure_msg
+	    log_failure_msg "$out"
+	    log_faiulre_msg
 	    exit 1
 	fi
 }
@@ -83,7 +85,7 @@ if [ -f $DEFAULTS ]; then
 fi
 
 if [ "$RUN_KAMAILIO" != "yes" ]; then
-    echo "Kamailio not yet configured. Edit /etc/default/kamailio first."
+    log_failure_msg "Kamailio not yet configured. Edit /etc/default/kamailio first."
     exit 0
 fi
 
@@ -121,44 +123,33 @@ case "$1" in
 	    check_fork
 	fi
 
-	echo -n "Starting $DESC: $NAME"
+	log_daemon_msg "Starting $DESC: $NAME"
 	start-stop-daemon --start --quiet --pidfile $PIDFILE \
-		--exec $DAEMON -- $OPTIONS || echo -n " already running"
-	echo "."
+		--exec $DAEMON -- $OPTIONS || log_failure_msg " already running"
+	log_end_msg
 	;;
   stop)
-	echo -n "Stopping $DESC: $NAME"
+	log_daemon_msg "Stopping $DESC: $NAME"
 	start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE \
 		--exec $DAEMON
-	echo "."
+	log_end_msg
 	;;
   restart|force-reload)
 	check_kamailio_config
 	create_radius_seqfile
 
-	echo -n "Restarting $DESC: $NAME"
+	log_daemon_msg "Restarting $DESC: $NAME"
 	start-stop-daemon --oknodo --stop --quiet --pidfile \
 		$PIDFILE --exec $DAEMON
 	sleep 1
 	start-stop-daemon --start --quiet --pidfile \
 		$PIDFILE --exec $DAEMON  -- $OPTIONS
-	echo "."
+	log_end_msg
 	;;
   status)
-	echo -n "Status of $DESC: "
-	
-	if [ ! -r "$PIDFILE" ]; then
-		echo "$NAME is not running."
-		exit 3
-	fi
+	log_daemon_msg "Status of $DESC: "
 	
-	if read pid < "$PIDFILE" && ps -p "$pid" > /dev/null 2>&1; then
-		echo "$NAME is running."
-		exit 0
-	else
-		echo "$NAME is not running but $PIDFILE exists."
-		exit 1
-	fi
+	status_of_porc "$PIDFILE" $NAME $NAME
 	;;
   *)
 	N=/etc/init.d/$NAME

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/kamailio.git