Bladeren bron

HUE-300. Adding a default log4j.properties file to the conf dir to make
java logging for beeswax configurable

vinithra 15 jaren geleden
bovenliggende
commit
3f5d85fd7f
2 gewijzigde bestanden met toevoegingen van 57 en 1 verwijderingen
  1. 3 1
      apps/beeswax/beeswax_server.sh
  2. 54 0
      desktop/conf.dist/log4j.properties

+ 3 - 1
apps/beeswax/beeswax_server.sh

@@ -37,7 +37,9 @@ BEESWAX_HIVE_LIB=$BEESWAX_ROOT/hive/lib
 echo \$HADOOP_HOME=$HADOOP_HOME
 echo \$HADOOP_HOME=$HADOOP_HOME
 
 
 export HADOOP_CLASSPATH=$(find $BEESWAX_HIVE_LIB -name "*.jar" | tr "\n" :):$HIVE_CONF_DIR:$BEESWAX_ROOT/../../desktop/libs/hadoop/static-group-mapping/java-lib/static-group-mapping-1.1.0.jar
 export HADOOP_CLASSPATH=$(find $BEESWAX_HIVE_LIB -name "*.jar" | tr "\n" :):$HIVE_CONF_DIR:$BEESWAX_ROOT/../../desktop/libs/hadoop/static-group-mapping/java-lib/static-group-mapping-1.1.0.jar
+export HADOOP_OPTS="-Dlog4j.configuration=log4j.properties"
 echo \$HADOOP_CLASSPATH=$HADOOP_CLASSPATH
 echo \$HADOOP_CLASSPATH=$HADOOP_CLASSPATH
+echo \$HADOOP_OPTS=$HADOOP_OPTS
 
 
 # Use HADOOP_CONF_DIR to preprend to classpath, to avoid fb303 conflict,
 # Use HADOOP_CONF_DIR to preprend to classpath, to avoid fb303 conflict,
 # and to force hive-default to correspond to the Hive version we have.
 # and to force hive-default to correspond to the Hive version we have.
@@ -49,7 +51,7 @@ fi
 if [ -f $HADOOP_CONF_DIR/hadoop-env.sh ]; then
 if [ -f $HADOOP_CONF_DIR/hadoop-env.sh ]; then
   . $HADOOP_CONF_DIR/hadoop-env.sh
   . $HADOOP_CONF_DIR/hadoop-env.sh
 fi
 fi
-export HADOOP_CONF_DIR=${BEESWAX_HIVE_LIB}/hive-default-xml-0.5.0.jar:${HADOOP_CONF_DIR}:$(find $BEESWAX_HIVE_LIB -name "libfb303.jar" | head -1)
+export HADOOP_CONF_DIR=$BEESWAX_ROOT/../../desktop/conf:${BEESWAX_HIVE_LIB}/hive-default-xml-0.5.0.jar:${HADOOP_CONF_DIR}:$(find $BEESWAX_HIVE_LIB -name "libfb303.jar" | head -1)
 echo \$HADOOP_CONF_DIR=$HADOOP_CONF_DIR
 echo \$HADOOP_CONF_DIR=$HADOOP_CONF_DIR
 
 
 # Note: I've had trouble running this with just "java -jar" with the classpath
 # Note: I've had trouble running this with just "java -jar" with the classpath

+ 54 - 0
desktop/conf.dist/log4j.properties

@@ -0,0 +1,54 @@
+# Define some default values that can be overridden by system properties
+hadoop.log.dir=.
+hadoop.log.file=hadoop.log
+
+# Define the root logger to the system property "hadoop.root.logger".
+log4j.rootLogger=INFO,console, EventCounter
+
+# Logging Threshold
+log4j.threshhold=ALL
+
+#
+# Daily Rolling File Appender
+#
+
+log4j.appender.DRFA=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.DRFA.File=${hadoop.log.dir}/${hadoop.log.file}
+
+# Rollver at midnight
+log4j.appender.DRFA.DatePattern=.yyyy-MM-dd
+
+# 30-day backup
+#log4j.appender.DRFA.MaxBackupIndex=30
+log4j.appender.DRFA.layout=org.apache.log4j.PatternLayout
+
+# Pattern format: Date LogLevel LoggerName LogMessage
+log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} %p %c: %m%n
+# Debugging Pattern format
+#log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} %-5p %c{2} (%F:%M(%L)) - %m%n
+
+
+#
+# console
+# Add "console" to rootlogger above if you want to use this
+#
+
+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
+#
+
+#log4j.appender.RFA=org.apache.log4j.RollingFileAppender
+#log4j.appender.RFA.File=${hadoop.log.dir}/${hadoop.log.file}
+
+# Logfile size and and 30-day backups
+#log4j.appender.RFA.MaxFileSize=1MB
+#log4j.appender.RFA.MaxBackupIndex=30
+
+#log4j.appender.RFA.layout=org.apache.log4j.PatternLayout
+#log4j.appender.RFA.layout.ConversionPattern=%d{ISO8601} %-5p %c{2} - %m%n
+#log4j.appender.RFA.layout.ConversionPattern=%d{ISO8601} %-5p %c{2} (%F:%M(%L)) - %m%n