summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2010-09-19 16:58:10 +0000
committerRobert Gemmell <robbie@apache.org>2010-09-19 16:58:10 +0000
commit7b0ceaee18b812d04de6fcdabaea666ce8bcb25b (patch)
tree971ec4430fbb6539560a36c216d9d382106cc41b
parent4544ccf4838a71d163318b172ab35414635f912e (diff)
downloadqpid-python-7b0ceaee18b812d04de6fcdabaea666ce8bcb25b.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@998696 13f79535-47bb-0310-9956-ffa450edef68
-rwxr-xr-xqpid/java/broker/bin/qpid-server6
-rwxr-xr-xqpid/java/common/bin/qpid-run6
2 files changed, 6 insertions, 6 deletions
diff --git a/qpid/java/broker/bin/qpid-server b/qpid/java/broker/bin/qpid-server
index 18b43bee13..5c7e4182b6 100755
--- a/qpid/java/broker/bin/qpid-server
+++ b/qpid/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/qpid/java/common/bin/qpid-run b/qpid/java/common/bin/qpid-run
index 63bb648fd8..15d88992df 100755
--- a/qpid/java/common/bin/qpid-run
+++ b/qpid/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