Author: tross
Date: Tue Jun 3 08:13:01 2008
New Revision: 662821
URL: http://svn.apache.org/viewvc?rev=662821&view=rev
Log:
QPID-1114 moved --pid-dir from config file to startup script
Modified:
incubator/qpid/trunk/qpid/cpp/etc/qpidd
incubator/qpid/trunk/qpid/cpp/etc/qpidd.conf
Modified: incubator/qpid/trunk/qpid/cpp/etc/qpidd
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/etc/qpidd?rev=662821&r1=662820&r2=662821&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/etc/qpidd (original)
+++ incubator/qpid/trunk/qpid/cpp/etc/qpidd Tue Jun 3 08:13:01 2008
@@ -32,14 +32,14 @@
start() {
echo -n $"Starting Qpid AMQP daemon: "
- daemon --pidfile $pidfile --check $prog --user qpidd /usr/sbin/$prog
--daemon $QPIDD_OPTIONS
+ daemon --pidfile $pidfile --check $prog --user qpidd /usr/sbin/$prog
--daemon --pid-dir /var/run/qpidd $QPIDD_OPTIONS
RETVAL=$?
echo
[ $RETVAL = 0 ] && touch $lockfile
if [ $RETVAL = 0 ]; then
touch $pidfile
chown qpidd.qpidd $pidfile
- runuser -s /bin/sh qpidd -c "/usr/sbin/$prog --check > $pidfile"
+ runuser -s /bin/sh qpidd -c "/usr/sbin/$prog --check --pid-dir
/var/run/qpidd > $pidfile"
fi
return $RETVAL
}
Modified: incubator/qpid/trunk/qpid/cpp/etc/qpidd.conf
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/etc/qpidd.conf?rev=662821&r1=662820&r2=662821&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/etc/qpidd.conf (original)
+++ incubator/qpid/trunk/qpid/cpp/etc/qpidd.conf Tue Jun 3 08:13:01 2008
@@ -1,3 +1,2 @@
# Configuration file for qpidd.
# Using default settings, qpidd --help to see defaults.
-pid-dir=/var/run/qpidd
