From 3cf939a0994b4122cedbaaed4dc6263ee7710ac5 Mon Sep 17 00:00:00 2001
From: Martin Ritchie <ritchiem@apache.org>
Date: Mon, 7 Sep 2009 12:17:09 +0000
Subject: QPID-2085 : Set append to true by default. Added QPID_LOG_APPEND
 variable to control setting from the environment

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@812103 13f79535-47bb-0310-9956-ffa450edef68
---
 java/broker/bin/qpid-server | 9 +++++++--
 java/broker/etc/log4j.xml   | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/java/broker/bin/qpid-server b/java/broker/bin/qpid-server
index e5a9e998e2..738fc6e084 100755
--- a/java/broker/bin/qpid-server
+++ b/java/broker/bin/qpid-server
@@ -26,14 +26,19 @@ 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
 
+# Default Log4j to append to its log file
+if [ -z "$QPID_LOG_APPEND" ]; then
+    export QPID_LOG_APPEND="true"
+fi
+
 # Set other variables used by the qpid-run script before calling
 export JAVA=java \
        JAVA_VM=-server \
        JAVA_MEM=-Xmx1024m \
        JAVA_GC="-XX:+UseConcMarkSweepGC -XX:+HeapDumpOnOutOfMemoryError" \
        QPID_CLASSPATH=$QPID_LIBS \
-       QPID_RUN_LOG=2
+       QPID_RUN_LOG=2 
 
-QPID_OPTS="$QPID_OPTS -Damqj.read_write_pool_size=32"
+QPID_OPTS="$QPID_OPTS -Damqj.read_write_pool_size=32 -DQPID_LOG_APPEND=$QPID_LOG_APPEND"
 
 . qpid-run org.apache.qpid.server.Main "$@"
diff --git a/java/broker/etc/log4j.xml b/java/broker/etc/log4j.xml
index a395d0fd56..8ca43ededd 100644
--- a/java/broker/etc/log4j.xml
+++ b/java/broker/etc/log4j.xml
@@ -50,7 +50,7 @@
 
     <appender class="org.apache.log4j.FileAppender" name="FileAppender">
         <param name="File" value="${QPID_WORK}/log/${logprefix}qpid${logsuffix}.log"/>
-        <param name="Append" value="false"/>
+        <param name="Append" value="${QPID_LOG_APPEND}"/>
 
         <layout class="org.apache.log4j.PatternLayout">
             <param name="ConversionPattern" value="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
-- 
cgit v1.2.1