svn commit: r1590777 - /qpid/trunk/qpid/cpp/etc/qpidd.in

[ac...@apache.org]

Author: aconway
Date: Mon Apr 28 20:21:11 2014
New Revision: 1590777

URL: http://svn.apache.org/r1590777
Log:
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.

Modified:
    qpid/trunk/qpid/cpp/etc/qpidd.in

Modified: qpid/trunk/qpid/cpp/etc/qpidd.in
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/etc/qpidd.in?rev=1590777&r1=1590776&r2=1590777&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/etc/qpidd.in (original)
+++ qpid/trunk/qpid/cpp/etc/qpidd.in Mon Apr 28 20:21:11 2014
@@ -51,11 +51,16 @@ test -f @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() {



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org