diff options
| author | Robert Gemmell <robbie@apache.org> | 2010-09-19 16:58:10 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2010-09-19 16:58:10 +0000 |
| commit | c1bb973cd263641244438e52b774e9f6ed566822 (patch) | |
| tree | fe5baceb5d03b91d99f177b7ff6b57cb45f475e4 /java | |
| parent | 92912bafb5f6f3ce07af1a4a779492f956c36faf (diff) | |
| download | qpid-python-c1bb973cd263641244438e52b774e9f6ed566822.tar.gz | |
QPID-2781: move broker process name tagging default from the common qpid-run used by multiple scripts, into the qpid-server script it is associated with
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@998696 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
| -rwxr-xr-x | java/broker/bin/qpid-server | 6 | ||||
| -rwxr-xr-x | java/common/bin/qpid-run | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/java/broker/bin/qpid-server b/java/broker/bin/qpid-server index 18b43bee13..5c7e4182b6 100755 --- a/java/broker/bin/qpid-server +++ b/java/broker/bin/qpid-server @@ -27,6 +27,12 @@ if [ -z "$QPID_WORK" ]; then QPID_WORK=$HOME 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 + # Set classpath to include Qpid jar with all required jars in manifest QPID_LIBS=$QPID_HOME/lib/qpid-all.jar:$QPID_HOME/lib/bdbstore-launch.jar diff --git a/java/common/bin/qpid-run b/java/common/bin/qpid-run index 63bb648fd8..15d88992df 100755 --- a/java/common/bin/qpid-run +++ b/java/common/bin/qpid-run @@ -56,12 +56,6 @@ 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 |