svn commit: r709200 - /incubator/qpid/trunk/qpid/java/common/bin/qpid-run

[ma...@apache.org]

Author: marnie
Date: Thu Oct 30 09:36:45 2008
New Revision: 709200

URL: http://svn.apache.org/viewvc?rev=709200&view=rev
Log:
QPID-961 Nasty change to introduce a process name at the start of the broker command string to make killing it work on all platforms, and avoid killing client processes. 

Modified:
    incubator/qpid/trunk/qpid/java/common/bin/qpid-run

Modified: incubator/qpid/trunk/qpid/java/common/bin/qpid-run
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/bin/qpid-run?rev=709200&r1=709199&r2=709200&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/bin/qpid-run (original)
+++ incubator/qpid/trunk/qpid/java/common/bin/qpid-run Thu Oct 30 09:36:45 2008
@@ -56,6 +56,12 @@
     export AMQJ_LOGGING_LEVEL=info
 fi
 
+#Set to help us get round the manifold problems of ps/pgrep on various
+#platforms which gather up to prevent qpid_stop from working .....
+if [ -z "$QPID_PNAME" ]; then
+    export QPID_PNAME=" -DPNAME=QPBRKR"
+fi
+
 if [ -z "$QPID_HOME" ]; then
     export QPID_HOME=$(dirname $(dirname $(readlink -f $0)))
     export PATH=${PATH}:${QPID_HOME}/bin
@@ -253,6 +259,6 @@
   JAVA=$(cygpath -u $JAVA)
 fi
 
-COMMAND=($JAVA $JAVA_VM $JAVA_GC $JAVA_MEM $SYSTEM_PROPS $JAVA_OPTS $QPID_OPTS "${JAVA_ARGS[@]}")
+COMMAND=($JAVA $JAVA_VM $QPID_PNAME $JAVA_GC $JAVA_MEM $SYSTEM_PROPS $JAVA_OPTS $QPID_OPTS "${JAVA_ARGS[@]}")
 
 DISPATCH