diff options
Diffstat (limited to 'java')
| -rwxr-xr-x | java/broker/bin/qpid-server | 12 | ||||
| -rwxr-xr-x | java/common/bin/qpid-run | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/java/broker/bin/qpid-server b/java/broker/bin/qpid-server index 72829f3e5b..18b43bee13 100755 --- a/java/broker/bin/qpid-server +++ b/java/broker/bin/qpid-server @@ -22,6 +22,11 @@ if [ -z "$QPID_HOME" ]; then export QPID_HOME=`cd $WHEREAMI/../ && pwd` fi +if [ -z "$QPID_WORK" ]; then + echo "Setting QPID_WORK to $HOME as default" + QPID_WORK=$HOME +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 @@ -35,4 +40,11 @@ export JAVA=java \ QPID_OPTS="$QPID_OPTS -Damqj.read_write_pool_size=32 -DQPID_LOG_APPEND=$QPID_LOG_APPEND" +# Echo the PID to file. Since qpid-run is sourced and uses exec to +# launch the broker, this will give the brokers PID. +if [ -z "$QPID_PID_FILENAME" ]; then + export QPID_PID_FILENAME="qpid-server.pid" +fi +echo $$ > ${QPID_WORK}/${QPID_PID_FILENAME} + . ${QPID_HOME}/bin/qpid-run org.apache.qpid.server.Main "$@" diff --git a/java/common/bin/qpid-run b/java/common/bin/qpid-run index d91e496bb7..63bb648fd8 100755 --- a/java/common/bin/qpid-run +++ b/java/common/bin/qpid-run @@ -174,7 +174,7 @@ DISPATCH() { echo "CLASSPATH=${CLASSPATH}" echo "${COMMAND[@]}" fi - echo $$ > ${QPID_WORK}/qpid.pid + exec "${COMMAND[@]}" } |