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 2023/02/24 05:20:25 UTC
[kyuubi] branch master updated: [KYUUBI #4407] Adapt slf4j-2.x
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/kyuubi.git
The following commit(s) were added to refs/heads/master by this push:
new 0175e4649 [KYUUBI #4407] Adapt slf4j-2.x
0175e4649 is described below
commit 0175e4649a66c7e0e7cda5914e730382c5c763b0
Author: Fu Chen <cf...@gmail.com>
AuthorDate: Fri Feb 24 13:20:13 2023 +0800
[KYUUBI #4407] Adapt slf4j-2.x
### _Why are the changes needed?_
to adapt slf4j-2.x, Spark bumped the slf4j to version 2.0.3 in https://github.com/apache/spark/pull/37844.
https://github.com/apache/kyuubi/pull/4381#discussion_r1116449560
### _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.readthedocs.io/en/master/develop_tools/testing.html#running-tests) locally before make a pull request
Closes #4407 from cfmcgrady/spark34-slf4j.
Closes #4407
ecf1488c [Fu Chen] unused import
f4098b97 [Fu Chen] fix ut
Authored-by: Fu Chen <cf...@gmail.com>
Signed-off-by: Cheng Pan <ch...@apache.org>
---
kyuubi-common/src/main/scala/org/apache/kyuubi/Logging.scala | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/kyuubi-common/src/main/scala/org/apache/kyuubi/Logging.scala b/kyuubi-common/src/main/scala/org/apache/kyuubi/Logging.scala
index d70df0952..1df598132 100644
--- a/kyuubi-common/src/main/scala/org/apache/kyuubi/Logging.scala
+++ b/kyuubi-common/src/main/scala/org/apache/kyuubi/Logging.scala
@@ -22,7 +22,6 @@ import org.apache.logging.log4j.core.{Logger => Log4jLogger, LoggerContext}
import org.apache.logging.log4j.core.config.DefaultConfiguration
import org.slf4j.{Logger, LoggerFactory}
import org.slf4j.bridge.SLF4JBridgeHandler
-import org.slf4j.impl.StaticLoggerBinder
import org.apache.kyuubi.util.ClassUtils
@@ -117,16 +116,16 @@ object Logging {
// This distinguishes the log4j 1.2 binding, currently
// org.slf4j.impl.Log4jLoggerFactory, from the log4j 2.0 binding, currently
// org.apache.logging.slf4j.Log4jLoggerFactory
- val binderClass = StaticLoggerBinder.getSingleton.getLoggerFactoryClassStr
- "org.slf4j.impl.Log4jLoggerFactory".equals(binderClass)
+ "org.slf4j.impl.Log4jLoggerFactory"
+ .equals(LoggerFactory.getILoggerFactory.getClass.getName)
}
private[kyuubi] def isLog4j2: Boolean = {
// This distinguishes the log4j 1.2 binding, currently
// org.slf4j.impl.Log4jLoggerFactory, from the log4j 2.0 binding, currently
// org.apache.logging.slf4j.Log4jLoggerFactory
- val binderClass = StaticLoggerBinder.getSingleton.getLoggerFactoryClassStr
- "org.apache.logging.slf4j.Log4jLoggerFactory".equals(binderClass)
+ "org.apache.logging.slf4j.Log4jLoggerFactory"
+ .equals(LoggerFactory.getILoggerFactory.getClass.getName)
}
/**