You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kyuubi.apache.org by ch...@apache.org on 2022/07/04 05:51:44 UTC

[incubator-kyuubi] branch master updated: [KYUUBI #2850][FOLLOWUP] Fix default log4j2 configuration

This is an automated email from the ASF dual-hosted git repository.

chengpan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-kyuubi.git


The following commit(s) were added to refs/heads/master by this push:
     new 8dddfeb0a [KYUUBI #2850][FOLLOWUP] Fix default log4j2 configuration
8dddfeb0a is described below

commit 8dddfeb0afd230ecd2792f7e69cd440ade997392
Author: Cheng Pan <ch...@apache.org>
AuthorDate: Mon Jul 4 13:51:34 2022 +0800

    [KYUUBI #2850][FOLLOWUP] Fix default log4j2 configuration
    
    ### _Why are the changes needed?_
    
    Remove `conf/log4j2.properties.template` as it has been replaced by `conf/log4j2.xml.template`
    Remove `<ThresholdFilter level="FATAL"/>` in default stdout appender.
    
    ### _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
    
    - [ ] [Run test](https://kyuubi.apache.org/docs/latest/develop_tools/testing.html#running-tests) locally before make a pull request
    
    Closes #3000 from pan3793/log4j-followup.
    
    Closes #2850
    
    ccb9dd6e [Cheng Pan] [KYUUBI #2850][FOLLOWUP] Fix default log4j2 configuration
    
    Authored-by: Cheng Pan <ch...@apache.org>
    Signed-off-by: Cheng Pan <ch...@apache.org>
---
 conf/log4j2.properties.template                    | 51 ----------------------
 conf/log4j2.xml.template                           |  1 -
 .../src/main/resources/log4j2-defaults.xml         |  1 -
 3 files changed, 53 deletions(-)

diff --git a/conf/log4j2.properties.template b/conf/log4j2.properties.template
deleted file mode 100644
index 97606108f..000000000
--- a/conf/log4j2.properties.template
+++ /dev/null
@@ -1,51 +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 file
-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
-
-# Set the default kyuubi-ctl log level to WARN. When running the kyuubi-ctl, the
-# log level for this class is used to overwrite the root logger's log level.
-logger.ctl.name = org.apache.kyuubi.ctl.ServiceControlCli
-logger.ctl.level = error
-
-# Analysis MySQLFrontend protocol traffic
-# logger.mysql.name = org.apache.kyuubi.server.mysql.codec
-# logger.mysql.level = trace
-
-# Kyuubi BeeLine
-logger.beeline.name = org.apache.hive.beeline.KyuubiBeeLine
-logger.beeline.level = error
diff --git a/conf/log4j2.xml.template b/conf/log4j2.xml.template
index 44d523835..6aedf7652 100644
--- a/conf/log4j2.xml.template
+++ b/conf/log4j2.xml.template
@@ -24,7 +24,6 @@
         <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>
diff --git a/kyuubi-common/src/main/resources/log4j2-defaults.xml b/kyuubi-common/src/main/resources/log4j2-defaults.xml
index 61145fbb7..63841959a 100644
--- a/kyuubi-common/src/main/resources/log4j2-defaults.xml
+++ b/kyuubi-common/src/main/resources/log4j2-defaults.xml
@@ -23,7 +23,6 @@
         <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>