From f9b2197d2a7fa46d59509b281cfbd0dab75ce3b3 Mon Sep 17 00:00:00 2001 From: Eli Collins Date: Tue, 20 Dec 2011 17:17:26 +0000 Subject: [PATCH] HADOOP-7837. no NullAppender in the log4j config. Contributed by Eli Collins git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1221348 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++ .../hadoop-common/src/main/conf/log4j.properties | 3 +++ .../src/main/packages/templates/conf/log4j.properties | 3 +++ 3 files changed, 8 insertions(+) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index ce83dd415c..ddc2c46495 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -220,6 +220,8 @@ Release 0.23.1 - Unreleased HADOOP-7914. Remove the duplicated declaration of hadoop-hdfs test-jar in hadoop-project/pom.xml. (szetszwo) + HADOOP-7837. no NullAppender in the log4j config. (eli) + Release 0.23.0 - 2011-11-01 INCOMPATIBLE CHANGES diff --git a/hadoop-common-project/hadoop-common/src/main/conf/log4j.properties b/hadoop-common-project/hadoop-common/src/main/conf/log4j.properties index ede0c93480..777b2df8c5 100644 --- a/hadoop-common-project/hadoop-common/src/main/conf/log4j.properties +++ b/hadoop-common-project/hadoop-common/src/main/conf/log4j.properties @@ -19,6 +19,9 @@ log4j.rootLogger=${hadoop.root.logger}, EventCounter # Logging Threshold log4j.threshold=ALL +# Null Appender +log4j.appender.NullAppender=org.apache.log4j.varia.NullAppender + # # Daily Rolling File Appender # diff --git a/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/log4j.properties b/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/log4j.properties index 43da1b49be..cbc31ad5e5 100644 --- a/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/log4j.properties +++ b/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/log4j.properties @@ -28,6 +28,9 @@ log4j.rootLogger=${hadoop.root.logger}, EventCounter # Logging Threshold log4j.threshold=ALL +# Null Appender +log4j.appender.NullAppender=org.apache.log4j.varia.NullAppender + # # Daily Rolling File Appender #