summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2009-10-28 15:31:33 +0000
committerMartin Ritchie <ritchiem@apache.org>2009-10-28 15:31:33 +0000
commit5e802813ae0c47fc9d1c32b75c90300623026177 (patch)
tree4527d38434bf091aa6af80c9136e765125075d7b
parent404ab68cf47ea216becbc3efdb8ab898387c0523 (diff)
downloadqpid-python-5e802813ae0c47fc9d1c32b75c90300623026177.tar.gz
QPID-2085 : Revert the addition of APPEND. We should use a rolling file appender instead.
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5.x-dev@830593 13f79535-47bb-0310-9956-ffa450edef68
-rwxr-xr-xqpid/java/broker/bin/qpid-server5
-rw-r--r--qpid/java/broker/etc/log4j.xml2
2 files changed, 1 insertions, 6 deletions
diff --git a/qpid/java/broker/bin/qpid-server b/qpid/java/broker/bin/qpid-server
index 738fc6e084..4e11fd5fe7 100755
--- a/qpid/java/broker/bin/qpid-server
+++ b/qpid/java/broker/bin/qpid-server
@@ -26,11 +26,6 @@ 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 \
diff --git a/qpid/java/broker/etc/log4j.xml b/qpid/java/broker/etc/log4j.xml
index 4b71772a0e..484b203df8 100644
--- a/qpid/java/broker/etc/log4j.xml
+++ b/qpid/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="${QPID_LOG_APPEND}"/>
+ <param name="Append" value="false"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>