[DRE-commits] [stompserver] 01/02: updated init script. added DIETIME/STARTTIME (Closes: #576452) added source of default/stompserver (LP: #704687)

[Jonas Genannt]

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

hggh-guest pushed a commit to branch master
in repository stompserver.

commit 315de83a0a81d2ff2ff67a6dfeb17f7630efcc39
Author: Jonas Genannt <jonas at brachium-system.net>
Date:   Sun Dec 1 14:40:21 2013 +0100

    updated init script. added DIETIME/STARTTIME (Closes: #576452) added source of default/stompserver (LP: #704687)
---
 debian/stompserver.init | 36 ++++++++++++++----------------------
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/debian/stompserver.init b/debian/stompserver.init
index 93ee566..6ef8825 100644
--- a/debian/stompserver.init
+++ b/debian/stompserver.init
@@ -18,8 +18,11 @@
 
 DAEMON=/usr/bin/stompserver
 NAME=stompserver
+DEFAULT=/etc/default/$NAME
 DESC=stompserver
 PIDFILE=/var/run/$NAME/pid
+STARTTIME=2
+DIETIME=2
 
 test -x $DAEMON || exit 0
 
@@ -29,25 +32,22 @@ if [ ! -d /var/run/stompserver ]; then
   mkdir -p /var/run/stompserver
 fi
 
+# Read configuration variable file if it is present
+[ -r $DEFAULT ] && . $DEFAULT
+
 chown stompserver:stompserver /var/run/stompserver
 
 DAEMON_OPTS="-C /etc/stompserver/stompserver.conf"
 
-running_pid() {                                                                 
-  pid=$1
-  name=$2                                                                     
-  [ -z "$pid" ] && return 1                                                   
-  [ ! -d /proc/$pid ] &&  return 1                                            
-  cmd=`awk '/Name:/ {print $2}' /proc/$pid/status`
-  [ "$cmd" != "$name" ] &&  return 1                                          
-  return 0 
-}   
-
 running() {                                                                     
   [ ! -f "$PIDFILE" ] && return 1
-  pid=`cat $PIDFILE`
-  running_pid $pid $NAME || return 1                                        
-  return 0
+  status="0"
+  pidofproc -p $PIDFILE $NAME >/dev/null || status="$?"
+  if [ "$status" = 0 ]; then
+    return 0
+  else
+   return 1
+  fi
 }   
 
 start_server() {                                                                
@@ -144,15 +144,7 @@ case "$1" in
     log_end_msg $errcode
     ;;
   status)
-    log_daemon_msg "Checking status of $DESC" "$NAME"
-    if running ;  then
-      log_progress_msg "running"
-      log_end_msg 0
-    else
-      log_progress_msg "apparently not running"
-      log_end_msg 1
-      exit 1
-    fi
+    status_of_proc -p $PIDFILE $DAEMON "stompserver" && exit 0 || exit $?
     ;;
   reload)
     log_warning_msg "Reloading $NAME daemon: not implemented, as the daemon"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/stompserver.git