diff options
Diffstat (limited to 'qpid/java/broker/bin/qpid-server')
| -rwxr-xr-x | qpid/java/broker/bin/qpid-server | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/qpid/java/broker/bin/qpid-server b/qpid/java/broker/bin/qpid-server index e5a9e998e2..7482ad63ef 100755 --- a/qpid/java/broker/bin/qpid-server +++ b/qpid/java/broker/bin/qpid-server @@ -23,6 +23,12 @@ if [ -z "$QPID_HOME" ]; then export PATH=${PATH}:${QPID_HOME}/bin fi +if [ -z "$QPID_LOG4J_SETTINGS" ]; then + # Disable the Log4J default initialization process, allowing the broker to + # perform the configuration using etc/log4j.xml + QPID_LOG4J_SETTINGS="-Dlog4j.defaultInitOverride=true" +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 @@ -34,6 +40,6 @@ export JAVA=java \ QPID_CLASSPATH=$QPID_LIBS \ QPID_RUN_LOG=2 -QPID_OPTS="$QPID_OPTS -Damqj.read_write_pool_size=32" +QPID_OPTS="$QPID_OPTS $QPID_LOG4J_SETTINGS -Damqj.read_write_pool_size=32" . qpid-run org.apache.qpid.server.Main "$@" |