[KYUUBI #2850][FOLLOWUP] Provide log4j2.xml.template in binary and use log4j2-defaults.xml
### _Why are the changes needed?_ This is a follow up of #2850 ### _How was this patch tested?_ - [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible - [x] Add screenshots for manual tests if appropriate - [ ] [Run test](https://kyuubi.apache.org/docs/latest/develop_tools/testing.html#running-tests) locally before make a pull request Closes #2971 from turboFei/remove_on_match_from_default. Closes #2850 10e6067e [Fei Wang] refactor 929fde7d [Fei Wang] comments 4ad12f11 [Fei Wang] add log4j1 91168b6c [Fei Wang] fix e5ac285e [Fei Wang] fix efe789eb [Fei Wang] [KYUUBI #2850][FOLLOWUP] Use log4j2 xml to take replace of log4j2 properties Authored-by: Fei Wang <fwang12@ebay.com> Signed-off-by: Fei Wang <fwang12@ebay.com>
This commit is contained in:
Fei Wang
parent
b7cd6f97fd
commit
cec8b03f39
48
conf/log4j2.xml.template
Normal file
48
conf/log4j2.xml.template
Normal file
@ -0,0 +1,48 @@
|
||||
<?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 %c: %m%n"/>
|
||||
<Filters>
|
||||
<ThresholdFilter level="FATAL"/>
|
||||
<RegexFilter regex=".*Thrift error occurred during processing of message.*" onMatch="DENY" onMismatch="NEUTRAL"/>
|
||||
</Filters>
|
||||
</Console>
|
||||
</Appenders>
|
||||
<Loggers>
|
||||
<Root level="INFO">
|
||||
<AppenderRef ref="stdout"/>
|
||||
</Root>
|
||||
<Logger name="org.apache.kyuubi.ctl.ServiceControlCli" level="error" additivity="false">
|
||||
<AppenderRef ref="stdout"/>
|
||||
</Logger>
|
||||
<!--
|
||||
<Logger name="org.apache.kyuubi.server.mysql.codec" level="trace" additivity="false">
|
||||
<AppenderRef ref="stdout"/>
|
||||
</Logger>
|
||||
-->
|
||||
<Logger name="org.apache.hive.beeline.KyuubiBeeLine" level="error" additivity="false">
|
||||
<AppenderRef ref="stdout"/>
|
||||
</Logger>
|
||||
</Loggers>
|
||||
</Configuration>
|
||||
@ -1,38 +0,0 @@
|
||||
#
|
||||
# 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.
|
||||
#
|
||||
|
||||
# Set everything to be logged to the console
|
||||
rootLogger.level = info
|
||||
rootLogger.appenderRef.stdout.ref = STDOUT
|
||||
|
||||
# Console Appender
|
||||
appender.console.type = Console
|
||||
appender.console.name = STDOUT
|
||||
appender.console.target = SYSTEM_OUT
|
||||
appender.console.layout.type = PatternLayout
|
||||
appender.console.layout.pattern = %d{yyyy-MM-dd HH:mm:ss.SSS} %p %c: %m%n
|
||||
|
||||
appender.console.filter.1.type = Filters
|
||||
|
||||
appender.console.filter.1.a.type = ThresholdFilter
|
||||
appender.console.filter.1.a.level = info
|
||||
|
||||
# SPARK-34128: Suppress undesirable TTransportException warnings, due to THRIFT-4805
|
||||
appender.console.filter.1.b.type = RegexFilter
|
||||
appender.console.filter.1.b.regex = .*Thrift error occurred during processing of message.*
|
||||
appender.console.filter.1.b.onMatch = deny
|
||||
appender.console.filter.1.b.onMismatch = neutral
|
||||
36
kyuubi-common/src/main/resources/log4j2-defaults.xml
Normal file
36
kyuubi-common/src/main/resources/log4j2-defaults.xml
Normal file
@ -0,0 +1,36 @@
|
||||
<?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.
|
||||
-->
|
||||
|
||||
<!-- 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 %c: %m%n"/>
|
||||
<Filters>
|
||||
<ThresholdFilter level="FATAL"/>
|
||||
<RegexFilter regex=".*Thrift error occurred during processing of message.*" onMatch="DENY" onMismatch="NEUTRAL"/>
|
||||
</Filters>
|
||||
</Console>
|
||||
</Appenders>
|
||||
<Loggers>
|
||||
<Root level="INFO">
|
||||
<AppenderRef ref="stdout"/>
|
||||
</Root>
|
||||
</Loggers>
|
||||
</Configuration>
|
||||
@ -96,7 +96,7 @@ trait Logging {
|
||||
// scalastyle:off println
|
||||
if (Logging.isLog4j2DefaultConfigured()) {
|
||||
Logging.useDefault = true
|
||||
val defaultLogProps = "log4j2-defaults.properties"
|
||||
val defaultLogProps = "log4j2-defaults.xml"
|
||||
Option(Thread.currentThread().getContextClassLoader.getResource(defaultLogProps)) match {
|
||||
case Some(url) =>
|
||||
val context = LogManager.getContext(false).asInstanceOf[LoggerContext]
|
||||
|
||||
3
pom.xml
3
pom.xml
@ -1599,7 +1599,8 @@
|
||||
</environmentVariables>
|
||||
<systemProperties>
|
||||
<log4j.ignoreTCL>true</log4j.ignoreTCL>
|
||||
<log4j2.configurationFile>file:src/test/resources/log4j2-test.xml</log4j2.configurationFile>
|
||||
<log4j.configuration>file:src/test/resources/log4j.properties</log4j.configuration>
|
||||
<log4j2.configurationFile>src/test/resources/log4j2-test.xml</log4j2.configurationFile>
|
||||
<java.io.tmpdir>${project.build.directory}/tmp</java.io.tmpdir>
|
||||
<spark.driver.memory>1g</spark.driver.memory>
|
||||
<kyuubi.metrics.json.location>${project.build.directory}/metrics</kyuubi.metrics.json.location>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user