diff options
| author | Andor Molnar <andor@apache.org> | 2022-01-27 10:06:29 +0100 |
|---|---|---|
| committer | Enrico Olivelli <eolivelli@apache.org> | 2022-01-27 10:06:29 +0100 |
| commit | 85551f9be5b054fa4aee0636597b12bda2ecb2e8 (patch) | |
| tree | 37e12f5c57c477619db7dc92178b55c8cc0139a8 /bin/zkServer.sh | |
| parent | 957f8fc0afbeca638f13f6fb739e49a921da2b9d (diff) | |
| download | zookeeper-85551f9be5b054fa4aee0636597b12bda2ecb2e8.tar.gz | |
ZOOKEEPER-4427: Migrate to Logback
This is the first commit of Logback migration task.
1. Replaced log4j dependencies with logback alternatives,
2. Replaced log4j.properties files with logback.xml
3. Refactored unit tests to use logback for log capturing.
This patch doesn't cover the zookeeper-contrib projects, only the main codebase.
Author: Andor Molnar <andor@apache.org>
Reviewers: Enrico Olivelli <eolivelli@apache.org>, Chris Nauroth <cnauroth@apache.org>, Mate Szalay-Beko <symat@apache.org>
Closes #1793 from anmolnar/ZOOKEEPER-4427
Diffstat (limited to 'bin/zkServer.sh')
| -rwxr-xr-x | bin/zkServer.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/zkServer.sh b/bin/zkServer.sh index 1a3cd359c..977c1bbf8 100755 --- a/bin/zkServer.sh +++ b/bin/zkServer.sh @@ -162,7 +162,7 @@ start) fi fi nohup "$JAVA" $ZOO_DATADIR_AUTOCREATE "-Dzookeeper.log.dir=${ZOO_LOG_DIR}" \ - "-Dzookeeper.log.file=${ZOO_LOG_FILE}" "-Dzookeeper.root.logger=${ZOO_LOG4J_PROP}" \ + "-Dzookeeper.log.file=${ZOO_LOG_FILE}" \ -XX:+HeapDumpOnOutOfMemoryError -XX:OnOutOfMemoryError='kill -9 %p' \ -cp "$CLASSPATH" $JVMFLAGS $ZOOMAIN "$ZOOCFG" > "$_ZOO_DAEMON_OUT" 2>&1 < /dev/null & if [ $? -eq 0 ] @@ -200,13 +200,13 @@ start-foreground) ZOO_CMD=("$JAVA") fi "${ZOO_CMD[@]}" $ZOO_DATADIR_AUTOCREATE "-Dzookeeper.log.dir=${ZOO_LOG_DIR}" \ - "-Dzookeeper.log.file=${ZOO_LOG_FILE}" "-Dzookeeper.root.logger=${ZOO_LOG4J_PROP}" \ + "-Dzookeeper.log.file=${ZOO_LOG_FILE}" \ -XX:+HeapDumpOnOutOfMemoryError -XX:OnOutOfMemoryError='kill -9 %p' \ -cp "$CLASSPATH" $JVMFLAGS $ZOOMAIN "$ZOOCFG" ;; print-cmd) echo "\"$JAVA\" $ZOO_DATADIR_AUTOCREATE -Dzookeeper.log.dir=\"${ZOO_LOG_DIR}\" \ - -Dzookeeper.log.file=\"${ZOO_LOG_FILE}\" -Dzookeeper.root.logger=\"${ZOO_LOG4J_PROP}\" \ + -Dzookeeper.log.file=\"${ZOO_LOG_FILE}\" \ -XX:+HeapDumpOnOutOfMemoryError -XX:OnOutOfMemoryError='kill -9 %p' \ -cp \"$CLASSPATH\" $JVMFLAGS $ZOOMAIN \"$ZOOCFG\" > \"$_ZOO_DAEMON_OUT\" 2>&1 < /dev/null" ;; @@ -287,7 +287,7 @@ status) fi fi echo "Client port found: $clientPort. Client address: $clientPortAddress. Client SSL: $isSSL." - STAT=`"$JAVA" "-Dzookeeper.log.dir=${ZOO_LOG_DIR}" "-Dzookeeper.root.logger=${ZOO_LOG4J_PROP}" "-Dzookeeper.log.file=${ZOO_LOG_FILE}" \ + STAT=`"$JAVA" "-Dzookeeper.log.dir=${ZOO_LOG_DIR}" "-Dzookeeper.log.file=${ZOO_LOG_FILE}" \ -cp "$CLASSPATH" $CLIENT_JVMFLAGS $JVMFLAGS org.apache.zookeeper.client.FourLetterWordMain \ $clientPortAddress $clientPort srvr $isSSL 2> /dev/null \ | $GREP Mode` |