From 5d7077d9b82b60a7fb5b95b4cd2393b15a6a7085 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Mon, 28 Apr 2014 20:21:11 +0000 Subject: QPID-5719: Fix unintentional dependency on qpid-ha for non-HA installations. qpidd init script should not use qpid-ha if it is not installed. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1590777 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/qpidd.in | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'qpid/cpp') diff --git a/qpid/cpp/etc/qpidd.in b/qpid/cpp/etc/qpidd.in index 7db59e369f..b5416668ba 100755 --- a/qpid/cpp/etc/qpidd.in +++ b/qpid/cpp/etc/qpidd.in @@ -51,11 +51,16 @@ test -f @sysconfdir@/sysconfig/$prog && source @sysconfdir@/sysconfig/$prog source /etc/rc.d/init.d/functions # Check presence of executables/scripts -for f in $QPID_BIN $QPID_HA; do +for f in $QPID_BIN; do test -x $f || { echo "$f not found or not executable"; exit 5; } done -QPID_HA="$QPID_HA $QPID_HA_OPTIONS" +qpid_ping() { + # Only do ping test if qpid-ha is installed. + if test -x $QPID_HA; then + $QPID_HA $QPID_HA_OPTIONS ping + fi +} RETVAL=0 @@ -68,7 +73,7 @@ fi do_status() { # Check PID file and ping for liveness - status $prog && $QPID_HA ping + status $prog && $qpid_ping } start() { -- cgit v1.2.1