From aba8fc8b7efef5983e8794e58854c759a9391f22 Mon Sep 17 00:00:00 2001
From: Nuno Santos <nsantos@apache.org>
Date: Tue, 1 Apr 2008 21:41:23 +0000
Subject: QPID-892 - use daemon params instead of runuser; store pid of qpidd
 daemon to kill single instance

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@643597 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/etc/qpidd | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'cpp')

diff --git a/cpp/etc/qpidd b/cpp/etc/qpidd
index 55d885ef66..d9076191d6 100755
--- a/cpp/etc/qpidd
+++ b/cpp/etc/qpidd
@@ -19,6 +19,7 @@
 
 prog=qpidd
 lockfile=/var/lock/subsys/$prog
+pidfile=/var/run/qpidd.pid
 
 # Source function library.
 . /etc/rc.d/init.d/functions
@@ -31,19 +32,24 @@ RETVAL=0
 
 start() {
 	echo -n $"Starting Qpid AMQP daemon: "
-	daemon --check $prog "runuser -s /bin/sh qpidd -c \"$prog --daemon $QPIDD_OPTIONS\""
+	daemon --pidfile $pidfile --check $prog --user qpidd $prog --daemon $QPIDD_OPTIONS
 	RETVAL=$?
 	echo
 	[ $RETVAL = 0 ] && touch $lockfile
+	if [ $RETVAL = 0 ]; then
+	    touch $pidfile
+	    chown qpidd.qpidd $pidfile
+	    runuser -s /bin/sh qpidd -c "qpidd -c > $pidfile"
+	fi
 	return $RETVAL
 }
 
 stop() {
 	echo -n $"Stopping Qpid AMQP daemon: "
-	killproc $prog
+	killproc -p ${pidfile} $prog
 	RETVAL=$?
 	echo
-	[ $RETVAL = 0 ] && rm -f $lockfile
+	[ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
 }
 
 reload() {
-- 
cgit v1.2.1