[KYUUBI #6196] Add log4j2 template for kyuubi repl commands
# 🔍 Description ## Issue References 🔗 This pull request fixes # ## Describe Your Solution 🔧 Add log4j2 template for kyuubi repl command. Since I want to add rolling logs for kyuubi server, we need to add independent log4j properties for kyuubi repl command. ## Types of changes 🔖 - [ ] Bugfix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to change) ## Test Plan 🧪 #### Behavior Without This Pull Request ⚰️ #### Behavior With This Pull Request 🎉 #### Related Unit Tests --- # Checklist 📝 - [X] This patch was not authored or co-authored using [Generative Tooling](https://www.apache.org/legal/generative-tooling.html) **Be nice. Be informative.** Closes #6196 from wForget/log4j_repl. Closes #6196 d8d64644d [wforget] newline 10a5b9fff [wforget] remove filter a775ee2d5 [wforget] Add log4j2 template for kyuubi repl command Authored-by: wforget <643348094@qq.com> Signed-off-by: Cheng Pan <chengpan@apache.org>
This commit is contained in:
parent
74351c7e6b
commit
31469fa7a6
@ -52,4 +52,8 @@ else
|
|||||||
KYUUBI_BEELINE_CLASSPATH="${KYUUBI_BEELINE_JARS}/*:${HADOOP_CONF_DIR}:${YARN_CONF_DIR}"
|
KYUUBI_BEELINE_CLASSPATH="${KYUUBI_BEELINE_JARS}/*:${HADOOP_CONF_DIR}:${YARN_CONF_DIR}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [[ -f ${KYUUBI_CONF_DIR}/log4j2-repl.xml ]]; then
|
||||||
|
KYUUBI_CTL_JAVA_OPTS="${KYUUBI_CTL_JAVA_OPTS} -Dlog4j2.configurationFile=log4j2-repl.xml"
|
||||||
|
fi
|
||||||
|
|
||||||
exec ${RUNNER} ${KYUUBI_BEELINE_OPTS} -cp ${KYUUBI_BEELINE_CLASSPATH} $CLASS "$@"
|
exec ${RUNNER} ${KYUUBI_BEELINE_OPTS} -cp ${KYUUBI_BEELINE_CLASSPATH} $CLASS "$@"
|
||||||
|
|||||||
@ -47,4 +47,8 @@ else
|
|||||||
KYUUBI_CLASSPATH="${KYUUBI_JAR_DIR}/*:${KYUUBI_CONF_DIR}:${HADOOP_CONF_DIR}:${YARN_CONF_DIR}"
|
KYUUBI_CLASSPATH="${KYUUBI_JAR_DIR}/*:${KYUUBI_CONF_DIR}:${HADOOP_CONF_DIR}:${YARN_CONF_DIR}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [[ -f ${KYUUBI_CONF_DIR}/log4j2-repl.xml ]]; then
|
||||||
|
KYUUBI_CTL_JAVA_OPTS="${KYUUBI_CTL_JAVA_OPTS} -Dlog4j2.configurationFile=log4j2-repl.xml"
|
||||||
|
fi
|
||||||
|
|
||||||
exec ${RUNNER} ${KYUUBI_CTL_JAVA_OPTS} -cp ${KYUUBI_CLASSPATH} $CLASS "$@"
|
exec ${RUNNER} ${KYUUBI_CTL_JAVA_OPTS} -cp ${KYUUBI_CLASSPATH} $CLASS "$@"
|
||||||
|
|||||||
@ -47,4 +47,8 @@ else
|
|||||||
KYUUBI_CLASSPATH="${KYUUBI_JAR_DIR}/*:${KYUUBI_CONF_DIR}:${HADOOP_CONF_DIR}:${YARN_CONF_DIR}"
|
KYUUBI_CLASSPATH="${KYUUBI_JAR_DIR}/*:${KYUUBI_CONF_DIR}:${HADOOP_CONF_DIR}:${YARN_CONF_DIR}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [[ -f ${KYUUBI_CONF_DIR}/log4j2-repl.xml ]]; then
|
||||||
|
KYUUBI_CTL_JAVA_OPTS="${KYUUBI_CTL_JAVA_OPTS} -Dlog4j2.configurationFile=log4j2-repl.xml"
|
||||||
|
fi
|
||||||
|
|
||||||
exec ${RUNNER} ${KYUUBI_CTL_JAVA_OPTS} -cp ${KYUUBI_CLASSPATH} $CLASS "$@"
|
exec ${RUNNER} ${KYUUBI_CTL_JAVA_OPTS} -cp ${KYUUBI_CLASSPATH} $CLASS "$@"
|
||||||
|
|||||||
@ -46,4 +46,8 @@ else
|
|||||||
KYUUBI_CLASSPATH="${KYUUBI_JAR_DIR}/*:${KYUUBI_CONF_DIR}:${HADOOP_CONF_DIR}:${YARN_CONF_DIR}"
|
KYUUBI_CLASSPATH="${KYUUBI_JAR_DIR}/*:${KYUUBI_CONF_DIR}:${HADOOP_CONF_DIR}:${YARN_CONF_DIR}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exec ${RUNNER} ${KYUUBI_JAVA_OPTS} -cp ${KYUUBI_CLASSPATH} $CLASS "$@"
|
if [[ -f ${KYUUBI_CONF_DIR}/log4j2-repl.xml ]]; then
|
||||||
|
KYUUBI_CTL_JAVA_OPTS="${KYUUBI_CTL_JAVA_OPTS} -Dlog4j2.configurationFile=log4j2-repl.xml"
|
||||||
|
fi
|
||||||
|
|
||||||
|
exec ${RUNNER} ${KYUUBI_JAVA_OPTS} -cp ${KYUUBI_CLASSPATH} $CLASS "$@"
|
||||||
|
|||||||
33
conf/log4j2-repl.xml.template
Normal file
33
conf/log4j2-repl.xml.template
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!--
|
||||||
|
~ Licensed to the Apache Software Foundation (ASF) under one or more
|
||||||
|
~ contributor license agreements. See the NOTICE file distributed with
|
||||||
|
~ this work for additional information regarding copyright ownership.
|
||||||
|
~ The ASF licenses this file to You under the Apache License, Version 2.0
|
||||||
|
~ (the "License"); you may not use this file except in compliance with
|
||||||
|
~ the License. You may obtain a copy of the License at
|
||||||
|
~
|
||||||
|
~ http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
~
|
||||||
|
~ Unless required by applicable law or agreed to in writing, software
|
||||||
|
~ distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
~ See the License for the specific language governing permissions and
|
||||||
|
~ limitations under the License.
|
||||||
|
-->
|
||||||
|
|
||||||
|
<!-- Provide log4j2.xml.template to fix `ERROR Filters contains invalid attributes "onMatch", "onMismatch"`, see KYUUBI-2247 -->
|
||||||
|
<!-- Extra logging related to initialization of Log4j.
|
||||||
|
Set to debug or trace if log4j initialization is failing. -->
|
||||||
|
<Configuration status="INFO">
|
||||||
|
<Appenders>
|
||||||
|
<Console name="stdout" target="SYSTEM_OUT">
|
||||||
|
<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %p %tn %c: %m%n%ex"/>
|
||||||
|
</Console>
|
||||||
|
</Appenders>
|
||||||
|
<Loggers>
|
||||||
|
<Root level="INFO">
|
||||||
|
<AppenderRef ref="stdout"/>
|
||||||
|
</Root>
|
||||||
|
</Loggers>
|
||||||
|
</Configuration>
|
||||||
@ -30,9 +30,6 @@
|
|||||||
<Appenders>
|
<Appenders>
|
||||||
<Console name="stdout" target="SYSTEM_OUT">
|
<Console name="stdout" target="SYSTEM_OUT">
|
||||||
<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %p %tn %c: %m%n%ex"/>
|
<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %p %tn %c: %m%n%ex"/>
|
||||||
<Filters>
|
|
||||||
<RegexFilter regex=".*Thrift error occurred during processing of message.*" onMatch="DENY" onMismatch="NEUTRAL"/>
|
|
||||||
</Filters>
|
|
||||||
</Console>
|
</Console>
|
||||||
<RollingFile name="restAudit" fileName="${sys:logDir}/${sys:restAuditLogPath}"
|
<RollingFile name="restAudit" fileName="${sys:logDir}/${sys:restAuditLogPath}"
|
||||||
filePattern="${sys:restAuditLogFilePattern}">
|
filePattern="${sys:restAuditLogFilePattern}">
|
||||||
@ -55,7 +52,7 @@
|
|||||||
<Root level="INFO">
|
<Root level="INFO">
|
||||||
<AppenderRef ref="stdout"/>
|
<AppenderRef ref="stdout"/>
|
||||||
</Root>
|
</Root>
|
||||||
<Logger name="org.apache.kyuubi.ctl.ServiceControlCli" level="error" additivity="false">
|
<Logger name="org.apache.kyuubi.ctl" level="error" additivity="false">
|
||||||
<AppenderRef ref="stdout"/>
|
<AppenderRef ref="stdout"/>
|
||||||
</Logger>
|
</Logger>
|
||||||
<!--
|
<!--
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user