github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-10 18:40:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix MiraiConsoleLoggerUnused.isEnabled

Browse Source
This commit is contained in:
Karlatemp 2020-10-24 19:58:29 +08:00
parent e9de080a96
commit 1d88a9d942
No known key found for this signature in database
GPG Key ID: 21FBDDF664FF06F8
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/internal/MiraiConsoleImplementationBridge.kt
View File

@ -112,6 +112,7 @@ internal object MiraiConsoleImplementationBridge : CoroutineScope, MiraiConsoleI
ConsoleDataScope.addAndReloadConfig(LoggerConfig) ConsoleDataScope.addAndReloadConfig(LoggerConfig)
} }
} }
phase `greeting`@{ phase `greeting`@{
val buildDateFormatted = val buildDateFormatted =
buildDate.atZone(ZoneId.systemDefault()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) buildDate.atZone(ZoneId.systemDefault()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))
@ -120,6 +121,7 @@ internal object MiraiConsoleImplementationBridge : CoroutineScope, MiraiConsoleI
mainLogger.info { "Backend: version $version, built on $buildDateFormatted." } mainLogger.info { "Backend: version $version, built on $buildDateFormatted." }
mainLogger.info { frontEndDescription.render() } mainLogger.info { frontEndDescription.render() }
} }
phase `check coroutineContext`@{ phase `check coroutineContext`@{
if (coroutineContext[Job] == null) { if (coroutineContext[Job] == null) {
throw MalformedMiraiConsoleImplementationError("The coroutineContext given to MiraiConsole must have a Job in it.") throw MalformedMiraiConsoleImplementationError("The coroutineContext given to MiraiConsole must have a Job in it.")

7
backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/logging/MiraiConsoleLoggerUnused.kt
View File

@ -45,17 +45,12 @@ internal class MiraiConsoleLoggerUnused(
delegateLogger.logger = logger delegateLogger.logger = logger
logger logger
} }
override val isEnabled: Boolean override val isEnabled: Boolean get() = logger.isEnabled
get() = super.isEnabled
override fun debug0(message: String?, e: Throwable?) = logger.debug(message, e) override fun debug0(message: String?, e: Throwable?) = logger.debug(message, e)
override fun error0(message: String?, e: Throwable?) = logger.error(message, e) override fun error0(message: String?, e: Throwable?) = logger.error(message, e)
override fun info0(message: String?, e: Throwable?) = logger.info(message, e) override fun info0(message: String?, e: Throwable?) = logger.info(message, e)
override fun verbose0(message: String?, e: Throwable?) = logger.verbose(message, e) override fun verbose0(message: String?, e: Throwable?) = logger.verbose(message, e)
override fun warning0(message: String?, e: Throwable?) = logger.warning(message, e) override fun warning0(message: String?, e: Throwable?) = logger.warning(message, e)
} }