github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-02-03 20:53:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make log4j.Logger.asMiraiLogger and useLog4j2 stable

Browse Source
This commit is contained in:
Him188 2022-05-02 10:49:29 +01:00
parent ce3cbbf771
commit 54eb4387e4
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mirai-core-api/compatibility-validation/android/api/android.api
View File

@ -6078,7 +6078,9 @@ public final class net/mamoe/mirai/utils/LoggerAdapters {
public static final field INSTANCE Lnet/mamoe/mirai/utils/LoggerAdapters;
public static final fun asMiraiLogger (Ljava/util/logging/Logger;)Lnet/mamoe/mirai/utils/MiraiLogger;
public static final fun asMiraiLogger (Lorg/apache/logging/log4j/Logger;)Lnet/mamoe/mirai/utils/MiraiLogger;
public static final fun asMiraiLogger (Lorg/apache/logging/log4j/Logger;Lorg/apache/logging/log4j/Marker;)Lnet/mamoe/mirai/utils/MiraiLogger;
public static final fun asMiraiLogger (Lorg/slf4j/Logger;)Lnet/mamoe/mirai/utils/MiraiLogger;
public static final fun useLog4j2 ()V
}
public abstract class net/mamoe/mirai/utils/LoginSolver {

2
mirai-core-api/compatibility-validation/jvm/api/jvm.api
View File

@ -6078,7 +6078,9 @@ public final class net/mamoe/mirai/utils/LoggerAdapters {
public static final field INSTANCE Lnet/mamoe/mirai/utils/LoggerAdapters;
public static final fun asMiraiLogger (Ljava/util/logging/Logger;)Lnet/mamoe/mirai/utils/MiraiLogger;
public static final fun asMiraiLogger (Lorg/apache/logging/log4j/Logger;)Lnet/mamoe/mirai/utils/MiraiLogger;
public static final fun asMiraiLogger (Lorg/apache/logging/log4j/Logger;Lorg/apache/logging/log4j/Marker;)Lnet/mamoe/mirai/utils/MiraiLogger;
public static final fun asMiraiLogger (Lorg/slf4j/Logger;)Lnet/mamoe/mirai/utils/MiraiLogger;
public static final fun useLog4j2 ()V
}
public abstract class net/mamoe/mirai/utils/LoginSolver {

10
mirai-core-api/src/commonMain/kotlin/utils/LoggerAdapters.kt
View File

@ -1,10 +1,10 @@
/*
* Copyright 2019-2021 Mamoe Technologies and contributors.
* Copyright 2019-2022 Mamoe Technologies and contributors.
*
* 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
* Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link.
* 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
* Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link.
*
* https://github.com/mamoe/mirai/blob/master/LICENSE
* https://github.com/mamoe/mirai/blob/dev/LICENSE
*/
@file:Suppress("unused")
@ -31,7 +31,6 @@ public object LoggerAdapters {
* @since 2.7
*/
@JvmStatic
@MiraiExperimentalApi
public fun useLog4j2() {
DefaultFactoryOverrides.override { requester, identity ->
val logger = LogManager.getLogger(requester)
@ -69,7 +68,6 @@ public object LoggerAdapters {
*
* @since 2.7
*/
@MiraiExperimentalApi
@JvmStatic
public fun org.apache.logging.log4j.Logger.asMiraiLogger(marker: Marker): MiraiLogger {
return Log4jLoggerAdapter(this, marker)