diff --git a/llap-server/bin/runLlapDaemon.sh b/llap-server/bin/runLlapDaemon.sh index b015ccb..90aba21 100755 --- a/llap-server/bin/runLlapDaemon.sh +++ b/llap-server/bin/runLlapDaemon.sh @@ -127,7 +127,7 @@ if [ -n "$LLAP_DAEMON_TMP_DIR" ]; then export LLAP_DAEMON_OPTS="${LLAP_DAEMON_OPTS} -Djava.io.tmpdir=$LLAP_DAEMON_TMP_DIR" fi -LLAP_DAEMON_OPTS="${LLAP_DAEMON_OPTS} -Dlog4j.configurationFile=llap-daemon-log4j2.properties" +LLAP_DAEMON_OPTS="${LLAP_DAEMON_OPTS} -Dlog4j.configurationFile=llap-daemon-log4j2.properties -DLog4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector" LLAP_DAEMON_OPTS="${LLAP_DAEMON_OPTS} -Dllap.daemon.log.dir=${LLAP_DAEMON_LOG_DIR}" LLAP_DAEMON_OPTS="${LLAP_DAEMON_OPTS} -Dllap.daemon.log.file=${LLAP_DAEMON_LOG_FILE}" LLAP_DAEMON_OPTS="${LLAP_DAEMON_OPTS} -Dllap.daemon.root.logger=${LLAP_DAEMON_LOGGER}" diff --git a/llap-server/src/main/resources/llap-daemon-log4j2.properties b/llap-server/src/main/resources/llap-daemon-log4j2.properties index 5051ca5..6edd6dd 100644 --- a/llap-server/src/main/resources/llap-daemon-log4j2.properties +++ b/llap-server/src/main/resources/llap-daemon-log4j2.properties @@ -38,8 +38,10 @@ appender.console.layout.type = PatternLayout appender.console.layout.pattern = %d{yy/MM/dd HH:mm:ss} [%t%x] %p %c{2} : %m%n # rolling file appender -appender.RFA.type = RollingFile +appender.RFA.type = RollingRandomAccessFile appender.RFA.name = RFA +appender.RFA.append = false +appender.RFA.immediateFlush = false appender.RFA.fileName = ${sys:llap.daemon.log.dir}/${sys:llap.daemon.log.file} appender.RFA.filePattern = ${sys:llap.daemon.log.dir}/${sys:llap.daemon.log.file}_%i appender.RFA.layout.type = PatternLayout @@ -51,8 +53,10 @@ appender.RFA.strategy.type = DefaultRolloverStrategy appender.RFA.strategy.max = ${sys:llap.daemon.log.maxbackupindex} # history file appender -appender.HISTORYAPPENDER.type = RollingFile +appender.HISTORYAPPENDER.type = RollingRandomAccessFile appender.HISTORYAPPENDER.name = HISTORYAPPENDER +appender.HISTORYAPPENDER.append = true +appender.HISTORYAPPENDER.immediateFlush = false appender.HISTORYAPPENDER.fileName = ${sys:llap.daemon.log.dir}/${sys:llap.daemon.historylog.file} appender.HISTORYAPPENDER.filePattern = ${sys:llap.daemon.log.dir}/${sys:llap.daemon.historylog.file}_%i appender.HISTORYAPPENDER.layout.type = PatternLayout @@ -89,5 +93,6 @@ logger.HistoryLogger.appenderRef.HistoryAppender.ref = HISTORYAPPENDER # root logger rootLogger.level = ${sys:llap.daemon.log.level} +rootLogger.includeLocation = false rootLogger.appenderRefs = root rootLogger.appenderRef.root.ref = ${sys:llap.daemon.root.logger} diff --git a/llap-server/src/main/resources/package.py b/llap-server/src/main/resources/package.py index 0204b7b..7c09262 100644 --- a/llap-server/src/main/resources/package.py +++ b/llap-server/src/main/resources/package.py @@ -57,7 +57,7 @@ def main(args): parser.add_argument("--instances", type=int, default=1) parser.add_argument("--output", default=output) parser.add_argument("--input", required=True) - parser.add_argument("--args", default="") + parser.add_argument("--args", default="-Dlog4j.configurationFile=llap-daemon-log4j2.properties -DLog4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector") parser.add_argument("--name", default="llap0") parser.add_argument("--loglevel", default="INFO") parser.add_argument("--chaosmonkey", type=int, default=0)