summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Wragg <dpw@lshift.net>2009-08-13 17:30:41 +0100
committerDavid Wragg <dpw@lshift.net>2009-08-13 17:30:41 +0100
commit9824ac05d733f91eb6338392fb0d1d9fc18fb957 (patch)
treeaa1bbb48c4d89d7e3223960d021813f8856aecba
parent67568ff2be2a4083350384e7b711e311227d78de (diff)
downloadrabbitmq-server-9824ac05d733f91eb6338392fb0d1d9fc18fb957.tar.gz
Remove the LOCK_FILE bits from the RPM init.d
The RPM init.d has some lock file support, but its not really functional (we never actually check whether it is present). So rip it out for now. We should put proper lock/pid file support back later.
-rw-r--r--packaging/RPMS/Fedora/init.d8
1 files changed, 2 insertions, 6 deletions
diff --git a/packaging/RPMS/Fedora/init.d b/packaging/RPMS/Fedora/init.d
index 1795433a..ca61eafd 100644
--- a/packaging/RPMS/Fedora/init.d
+++ b/packaging/RPMS/Fedora/init.d
@@ -24,8 +24,6 @@ USER=rabbitmq
NODE_COUNT=1
ROTATE_SUFFIX=
-LOCK_FILE=/var/lock/subsys/$NAME
-
test -x $DAEMON || exit 0
# Include rabbitmq defaults if available
@@ -41,7 +39,7 @@ start_rabbitmq () {
$DAEMON start_all ${NODE_COUNT} > /var/log/rabbitmq/startup_log 2> /var/log/rabbitmq/startup_err
case "$?" in
0)
- echo SUCCESS && touch $LOCK_FILE
+ echo SUCCESS
RETVAL=0
;;
1)
@@ -52,7 +50,7 @@ start_rabbitmq () {
echo FAILED - check /var/log/rabbitmq/startup_log, _err
RETVAL=1
;;
- esac
+ esac
set -e
}
@@ -64,8 +62,6 @@ stop_rabbitmq () {
RETVAL=$?
if [ $RETVAL != 0 ] ; then
echo FAILED - check /var/log/rabbitmq/shutdown_log, _err
- else
- rm -rf $LOCK_FILE
fi
else
echo No nodes running