Browse Source

HADOOP-292. Fix client-side logging to go to standard error rather than standard output so that it can be distinguished from application output. Contributed by Owen.

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk@413109 13f79535-47bb-0310-9956-ffa450edef68
Doug Cutting 19 years ago
parent
commit
1f3887859a
3 changed files with 14 additions and 7 deletions
  1. 4 0
      CHANGES.txt
  2. 3 1
      bin/hadoop
  3. 7 6
      conf/log4j.properties

+ 4 - 0
CHANGES.txt

@@ -26,6 +26,10 @@ Trunk (unreleased changes)
  7. HADOOP-289.  Improved exception handling in DFS datanode.
  7. HADOOP-289.  Improved exception handling in DFS datanode.
     (Konstantin Shvachko via cutting)
     (Konstantin Shvachko via cutting)
 
 
+ 8. HADOOP-292.  Fix client-side logging to go to standard error
+    rather than standard output, so that it can be distinguished from
+    application output.  (omalley via cutting)
+
 
 
 Release 0.3.1 - 2006-06-05
 Release 0.3.1 - 2006-06-05
 
 

+ 3 - 1
bin/hadoop

@@ -13,6 +13,8 @@
 #
 #
 #   HADOOP_CONF_DIR  Alternate conf dir. Default is ${HADOOP_HOME}/conf.
 #   HADOOP_CONF_DIR  Alternate conf dir. Default is ${HADOOP_HOME}/conf.
 #
 #
+#   HADOOP_ROOT_LOGGER The root appender. Default is INFO,console
+#
 
 
 # resolve links - $0 may be a softlink
 # resolve links - $0 may be a softlink
 THIS="$0"
 THIS="$0"
@@ -162,7 +164,7 @@ HADOOP_OPTS="$HADOOP_OPTS -Dhadoop.log.dir=$HADOOP_LOG_DIR"
 HADOOP_OPTS="$HADOOP_OPTS -Dhadoop.log.file=$HADOOP_LOGFILE"
 HADOOP_OPTS="$HADOOP_OPTS -Dhadoop.log.file=$HADOOP_LOGFILE"
 HADOOP_OPTS="$HADOOP_OPTS -Dhadoop.home.dir=$HADOOP_HOME"
 HADOOP_OPTS="$HADOOP_OPTS -Dhadoop.home.dir=$HADOOP_HOME"
 HADOOP_OPTS="$HADOOP_OPTS -Dhadoop.id.str=$HADOOP_IDENT_STRING"
 HADOOP_OPTS="$HADOOP_OPTS -Dhadoop.id.str=$HADOOP_IDENT_STRING"
-HADOOP_OPTS="$HADOOP_OPTS -Dhadoop.root.logger=${HADOOP_ROOT_LOGGER:-INFO,stdout}"
+HADOOP_OPTS="$HADOOP_OPTS -Dhadoop.root.logger=${HADOOP_ROOT_LOGGER:-INFO,console}"
 
 
 # run it
 # run it
 exec "$JAVA" $JAVA_HEAP_MAX $HADOOP_OPTS -classpath "$CLASSPATH" $CLASS "$@"
 exec "$JAVA" $JAVA_HEAP_MAX $HADOOP_OPTS -classpath "$CLASSPATH" $CLASS "$@"

+ 7 - 6
conf/log4j.properties

@@ -1,5 +1,5 @@
 # Define some default values that can be overridden by system properties
 # Define some default values that can be overridden by system properties
-hadoop.root.logger=INFO,stdout
+hadoop.root.logger=INFO,console
 hadoop.log.dir=.
 hadoop.log.dir=.
 hadoop.log.file=hadoop.log
 hadoop.log.file=hadoop.log
 
 
@@ -30,13 +30,14 @@ log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} %p %c: %m%n
 
 
 
 
 #
 #
-# stdout
-# Add *stdout* to rootlogger above if you want to use this 
+# console
+# Add "console" to rootlogger above if you want to use this 
 #
 #
 
 
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{2}: %m%n
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.target=System.err
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{2}: %m%n
 
 
 #
 #
 # Rolling File Appender
 # Rolling File Appender