diff options
| author | Marnie McCormack <marnie@apache.org> | 2008-10-30 16:36:45 +0000 |
|---|---|---|
| committer | Marnie McCormack <marnie@apache.org> | 2008-10-30 16:36:45 +0000 |
| commit | e075d59911269895fa8fcbdf382970f8955d434f (patch) | |
| tree | 6d6bf2e2d5bdec16ff5c3f4e08a7225e6bc436e3 | |
| parent | e2432f40a2fdfb7aa15b6b775677c75e28fde6d6 (diff) | |
| download | qpid-python-e075d59911269895fa8fcbdf382970f8955d434f.tar.gz | |
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.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@709200 13f79535-47bb-0310-9956-ffa450edef68
| -rwxr-xr-x | qpid/java/common/bin/qpid-run | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/qpid/java/common/bin/qpid-run b/qpid/java/common/bin/qpid-run index 1de0048f48..0b5070d937 100755 --- a/qpid/java/common/bin/qpid-run +++ b/qpid/java/common/bin/qpid-run @@ -56,6 +56,12 @@ if [ -z $AMQJ_LOGGING_LEVEL ]; then 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 @@ if $cygwin; then 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 |