[deltacloud-core: 3/3] Fixed init file

[Michal Fojtik]

commit b772da14618f327fb061e02622209b9966b2ebad
Author: Michal Fojtik <mi at mifo.sk>
Date:   Fri Nov 11 17:38:05 2011 +0100

    Fixed init file

 deltacloud-core.init |   33 ++++++++++++++++++++-------------
 1 files changed, 20 insertions(+), 13 deletions(-)
---
diff --git a/deltacloud-core.init b/deltacloud-core.init
index 7422c59..916cb7b 100644
--- a/deltacloud-core.init
+++ b/deltacloud-core.init
@@ -7,13 +7,13 @@
 
 ### BEGIN INIT INFO
 # Provides: deltacloud-core
-# Required-Start: 
-# Required-Stop: 
-# Default-Start: 3 5 
-# Default-Stop: 0 1 2 6 
+# Required-Start:
+# Required-Stop:
+# Default-Start: 3 5
+# Default-Stop: 0 1 2 6
 # Short-Description: Deltacloud Core API deamon
 # Description: Deltacloud Core API provides access to different cloud providers \
-#   using single REST API 
+#   using single REST API
 ### END INIT INFO
 
 . /etc/rc.d/init.d/functions
@@ -33,6 +33,7 @@ HOST="${HOST:-localhost}"
 DELTACLOUD_USER="${DELTACLOUD_USER:-nobody}"
 LOGFILE="${LOGFILE:-/var/log/$prog/$DRIVER.log}"
 LOCKFILE="${LOCKFILE:-/var/lock/subsys/$prog}"
+PIDFILE="${PIDFILE:-/var/run/deltacloud-core-$DRIVER.pid}"
 
 [ -r $LOGFILE ] && chown nobody $LOGFILE
 [ -r $LOCKFILE ] && chown nobody $LOCKFILE
@@ -40,8 +41,8 @@ LOCKFILE="${LOCKFILE:-/var/lock/subsys/$prog}"
 start() {
     [ -x $exec ] || exit 5
 
-    echo -n $"Starting $prog: "
-    daemon --user "$DELTACLOUD_USER" "$exec -i $DRIVER -e $API_ENV --port $PORT -r $HOST >> $LOGFILE 2>&1 &"
+    echo -n $"Starting $prog-$DRIVER: "
+    daemon "$exec -i $DRIVER -e $API_ENV --user $DELTACLOUD_USER --daemon --pid $PIDFILE --port $PORT --host $HOST"
     retval=$?
 
     if [ $retval -eq 0 ] && touch $LOCKFILE ; then
@@ -56,16 +57,22 @@ start() {
 
 stop() {
     echo -n $"Shutting down $prog: "
-    killproc deltacloudd
-    retval=$?
-    if [ $retval -eq 0 ] && rm -f $LOCKFILE ; then
-      echo_success
-      echo
+    if [ -f $PIDFILE ]; then
+      kill -3 `cat $PIDFILE`
+      retval=$?
+      if [ $retval -eq 0 ] && rm -f $LOCKFILE $PIDFILE; then
+        echo_success
+        echo
+      else
+        echo_failure
+        echo
+      fi
+      return $retval
     else
       echo_failure
       echo
+      return 1
     fi
-    return $retval
 }
 
 case "$1" in