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

Close bot with runCatching

Browse Source
This commit is contained in:
Karlatemp 2021-03-11 22:43:15 +08:00
parent 34135b5a4d
commit ee1561f97d
No known key found for this signature in database
GPG Key ID: 21FBDDF664FF06F8
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
backend/mirai-console/src/command/BuiltInCommands.kt
View File

@ -49,6 +49,7 @@ import net.mamoe.mirai.console.util.sendAnsiMessage
import net.mamoe.mirai.event.events.EventCancelledException import net.mamoe.mirai.event.events.EventCancelledException
import net.mamoe.mirai.message.nextMessageOrNull import net.mamoe.mirai.message.nextMessageOrNull
import net.mamoe.mirai.utils.BotConfiguration import net.mamoe.mirai.utils.BotConfiguration
import net.mamoe.mirai.utils.MiraiLogger
import net.mamoe.mirai.utils.secondsToMillis import net.mamoe.mirai.utils.secondsToMillis
import java.lang.management.ManagementFactory import java.lang.management.ManagementFactory
import java.lang.management.MemoryUsage import java.lang.management.MemoryUsage
@ -131,7 +132,15 @@ public object BuiltInCommands {
if (!MiraiConsole.isActive) return@withLock if (!MiraiConsole.isActive) return@withLock
sendMessage("Stopping mirai-console") sendMessage("Stopping mirai-console")
kotlin.runCatching { kotlin.runCatching {
Bot.instances.forEach { it.closeAndJoin() } Bot.instances.forEach { bot ->
lateinit var logger: MiraiLogger
kotlin.runCatching {
logger = bot.logger
bot.closeAndJoin()
}.onFailure { t ->
kotlin.runCatching { logger.error("Error in closing bot", t) }
}
}
MiraiConsole.job.cancelAndJoin() MiraiConsole.job.cancelAndJoin()
}.fold( }.fold(
onSuccess = { onSuccess = {