svn commit: r814545 - /qpid/trunk/qpid/java/broker/bin/qpid.stop

[ri...@apache.org]

Author: ritchiem
Date: Mon Sep 14 09:52:05 2009
New Revision: 814545

URL: http://svn.apache.org/viewvc?rev=814545&view=rev
Log:
QPID-2100 : Updated qpid.stop to use QPID_PNAME variable as the search. This brings it in line with qpid-run.
If QPID_PNAME is not set then it will fall back to QPID_STOP_SERVER so as to main backward compatibility.
If neither are set then it will only use -DPNAME=" as the search. Thus allowing the value to have been changed
and this script still to detect QPID processes.

Modified:
    qpid/trunk/qpid/java/broker/bin/qpid.stop

Modified: qpid/trunk/qpid/java/broker/bin/qpid.stop
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/bin/qpid.stop?rev=814545&r1=814544&r2=814545&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/bin/qpid.stop (original)
+++ qpid/trunk/qpid/java/broker/bin/qpid.stop Mon Sep 14 09:52:05 2009
@@ -25,12 +25,20 @@
 
 MAX_ATTEMPTS=2
 SLEEP_DELAY=1
-DEFAULT_SEARCH="PNAME=QPBRKR"
+DEFAULT_SEARCH="\-DPNAME=\""
 
-if [ -z "$QPID_STOP_SEARCH" ]; then
-    SEARCH=$DEFAULT_SEARCH;
+#
+# Use QPID_PNAME to set search criteria.
+#  - If not set default back to attempting QPID_STOP_SEARCH
+#
+if [ -z "$QPID_PNAME" ]; then
+    if [ -z "$QPID_STOP_SEARCH" ]; then
+        SEARCH=$DEFAULT_SEARCH;
+    else
+        SEARCH=$DEFAULT_SEARCH$QPID_STOP_SEARCH;
+    fi
 else
-    SEARCH=$QPID_STOP_SEARCH;
+    SEARCH=$DEFAULT_SEARCH$QPID_PNAME;
 fi
 
 #



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org