Skip to content

Commit 0acf971

Browse files
cfmcgradypan3793
cfmcgrady
authored and
pan3793
committed
[KYUUBI #2247] Change log4j2 properties to xml
### _Why are the changes needed?_ - change log4j2-test.properties to log4j2-test.xml - add the unit test log4j2.xml for spark relative submodule, and remove the log4j.properties ### _How was this patch tested?_ - [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible - [ ] Add screenshots for manual tests if appropriate - [x] [Run test](https://kyuubi.apache.org/docs/latest/develop_tools/testing.html#running-tests) locally before make a pull request Closes #2850 from cfmcgrady/kyuubi-2247. Closes #2247 a33d4d8 [Fu Chen] style f99dada [Fu Chen] fix style 49c99de [Fu Chen] add log4j2.xml for spark relative submodule a8a3856 [Fu Chen] change log4j2-test.properties to log4j2-test.xml Authored-by: Fu Chen <cfmcgrady@gmail.com> Signed-off-by: Cheng Pan <chengpan@apache.org>
1 parent df1ebba commit 0acf971

File tree

48 files changed

+990
-1169
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+990
-1169
lines changed

‎extensions/spark/kyuubi-extension-spark-3-1/src/test/resources/log4j.properties

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎extensions/spark/kyuubi-extension-spark-3-1/src/test/resources/log4j2-test.xml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Licensed to the Apache Software Foundation (ASF) under one or more
4+
~ contributor license agreements. See the NOTICE file distributed with
5+
~ this work for additional information regarding copyright ownership.
6+
~ The ASF licenses this file to You under the Apache License, Version 2.0
7+
~ (the "License"); you may not use this file except in compliance with
8+
~ the License. You may obtain a copy of the License at
9+
~
10+
~ http://www.apache.org/licenses/LICENSE-2.0
11+
~
12+
~ Unless required by applicable law or agreed to in writing, software
13+
~ distributed under the License is distributed on an "AS IS" BASIS,
14+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
~ See the License for the specific language governing permissions and
16+
~ limitations under the License.
17+
-->
18+
19+
<!-- Extra logging related to initialization of Log4j.
20+
Set to debug or trace if log4j initialization is failing. -->
21+
<Configuration status="WARN">
22+
<Appenders>
23+
<Console name="stdout" target="SYSTEM_OUT">
24+
<PatternLayout pattern="%d{HH:mm:ss.SSS} %p %c: %m%n"/>
25+
<Filters>
26+
<ThresholdFilter level="FATAL"/>
27+
<RegexFilter regex=".*Thrift error occurred during processing of message.*" onMatch="DENY" onMismatch="NEUTRAL"/>
28+
</Filters>
29+
</Console>
30+
<File name="file" fileName="target/unit-tests.log">
31+
<PatternLayout pattern="%d{HH:mm:ss.SSS} %t %p %c{1}: %m%n"/>
32+
<Filters>
33+
<RegexFilter regex=".*Thrift error occurred during processing of message.*" onMatch="DENY" onMismatch="NEUTRAL"/>
34+
</Filters>
35+
</File>
36+
</Appenders>
37+
<Loggers>
38+
<Root level="INFO">
39+
<AppenderRef ref="stdout"/>
40+
<AppenderRef ref="file"/>
41+
</Root>
42+
</Loggers>
43+
</Configuration>

‎extensions/spark/kyuubi-extension-spark-3-2/src/test/resources/log4j.properties

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎extensions/spark/kyuubi-extension-spark-3-3/src/test/resources/log4j.properties

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎extensions/spark/kyuubi-extension-spark-3-3/src/test/resources/log4j2-test.xml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Licensed to the Apache Software Foundation (ASF) under one or more
4+
~ contributor license agreements. See the NOTICE file distributed with
5+
~ this work for additional information regarding copyright ownership.
6+
~ The ASF licenses this file to You under the Apache License, Version 2.0
7+
~ (the "License"); you may not use this file except in compliance with
8+
~ the License. You may obtain a copy of the License at
9+
~
10+
~ http://www.apache.org/licenses/LICENSE-2.0
11+
~
12+
~ Unless required by applicable law or agreed to in writing, software
13+
~ distributed under the License is distributed on an "AS IS" BASIS,
14+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
~ See the License for the specific language governing permissions and
16+
~ limitations under the License.
17+
-->
18+
19+
<!-- Extra logging related to initialization of Log4j.
20+
Set to debug or trace if log4j initialization is failing. -->
21+
<Configuration status="WARN">
22+
<Appenders>
23+
<Console name="stdout" target="SYSTEM_OUT">
24+
<PatternLayout pattern="%d{HH:mm:ss.SSS} %p %c: %m%n"/>
25+
<Filters>
26+
<ThresholdFilter level="FATAL"/>
27+
<RegexFilter regex=".*Thrift error occurred during processing of message.*" onMatch="DENY" onMismatch="NEUTRAL"/>
28+
</Filters>
29+
</Console>
30+
<File name="file" fileName="target/unit-tests.log">
31+
<PatternLayout pattern="%d{HH:mm:ss.SSS} %t %p %c{1}: %m%n"/>
32+
<Filters>
33+
<RegexFilter regex=".*Thrift error occurred during processing of message.*" onMatch="DENY" onMismatch="NEUTRAL"/>
34+
</Filters>
35+
</File>
36+
</Appenders>
37+
<Loggers>
38+
<Root level="INFO">
39+
<AppenderRef ref="stdout"/>
40+
<AppenderRef ref="file"/>
41+
</Root>
42+
</Loggers>
43+
</Configuration>

‎extensions/spark/kyuubi-extension-spark-common/src/test/resources/log4j.properties

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎extensions/spark/kyuubi-extension-spark-common/src/test/resources/log4j2-test.xml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Licensed to the Apache Software Foundation (ASF) under one or more
4+
~ contributor license agreements. See the NOTICE file distributed with
5+
~ this work for additional information regarding copyright ownership.
6+
~ The ASF licenses this file to You under the Apache License, Version 2.0
7+
~ (the "License"); you may not use this file except in compliance with
8+
~ the License. You may obtain a copy of the License at
9+
~
10+
~ http://www.apache.org/licenses/LICENSE-2.0
11+
~
12+
~ Unless required by applicable law or agreed to in writing, software
13+
~ distributed under the License is distributed on an "AS IS" BASIS,
14+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
~ See the License for the specific language governing permissions and
16+
~ limitations under the License.
17+
-->
18+
19+
<!-- Extra logging related to initialization of Log4j.
20+
Set to debug or trace if log4j initialization is failing. -->
21+
<Configuration status="WARN">
22+
<Appenders>
23+
<Console name="stdout" target="SYSTEM_OUT">
24+
<PatternLayout pattern="%d{HH:mm:ss.SSS} %p %c: %m%n"/>
25+
<Filters>
26+
<ThresholdFilter level="FATAL"/>
27+
<RegexFilter regex=".*Thrift error occurred during processing of message.*" onMatch="DENY" onMismatch="NEUTRAL"/>
28+
</Filters>
29+
</Console>
30+
<File name="file" fileName="target/unit-tests.log">
31+
<PatternLayout pattern="%d{HH:mm:ss.SSS} %t %p %c{1}: %m%n"/>
32+
<Filters>
33+
<RegexFilter regex=".*Thrift error occurred during processing of message.*" onMatch="DENY" onMismatch="NEUTRAL"/>
34+
</Filters>
35+
</File>
36+
</Appenders>
37+
<Loggers>
38+
<Root level="INFO">
39+
<AppenderRef ref="stdout"/>
40+
<AppenderRef ref="file"/>
41+
</Root>
42+
</Loggers>
43+
</Configuration>

‎extensions/spark/kyuubi-spark-authz/src/test/resources/log4j2-test.properties

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎extensions/spark/kyuubi-spark-authz/src/test/resources/log4j2-test.xml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Licensed to the Apache Software Foundation (ASF) under one or more
4+
~ contributor license agreements. See the NOTICE file distributed with
5+
~ this work for additional information regarding copyright ownership.
6+
~ The ASF licenses this file to You under the Apache License, Version 2.0
7+
~ (the "License"); you may not use this file except in compliance with
8+
~ the License. You may obtain a copy of the License at
9+
~
10+
~ http://www.apache.org/licenses/LICENSE-2.0
11+
~
12+
~ Unless required by applicable law or agreed to in writing, software
13+
~ distributed under the License is distributed on an "AS IS" BASIS,
14+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
~ See the License for the specific language governing permissions and
16+
~ limitations under the License.
17+
-->
18+
19+
<!-- Extra logging related to initialization of Log4j.
20+
Set to debug or trace if log4j initialization is failing. -->
21+
<Configuration status="WARN">
22+
<Appenders>
23+
<Console name="stdout" target="SYSTEM_OUT">
24+
<PatternLayout pattern="%d{HH:mm:ss.SSS} %p %c: %m%n"/>
25+
<Filters>
26+
<ThresholdFilter level="FATAL"/>
27+
<RegexFilter regex=".*Thrift error occurred during processing of message.*" onMatch="DENY" onMismatch="NEUTRAL"/>
28+
</Filters>
29+
</Console>
30+
<File name="file" fileName="target/unit-tests.log">
31+
<PatternLayout pattern="%d{HH:mm:ss.SSS} %t %p %c{1}: %m%n"/>
32+
<Filters>
33+
<RegexFilter regex=".*Thrift error occurred during processing of message.*" onMatch="DENY" onMismatch="NEUTRAL"/>
34+
</Filters>
35+
</File>
36+
</Appenders>
37+
<Loggers>
38+
<Root level="INFO">
39+
<AppenderRef ref="stdout"/>
40+
<AppenderRef ref="file"/>
41+
</Root>
42+
</Loggers>
43+
</Configuration>

0 commit comments

Comments
 (0)