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

Fix exception logging in event processing

Browse Source
This commit is contained in:
Karlatemp 2021-02-03 18:57:23 +08:00
parent 62303e679f
commit 10eb7a452f
No known key found for this signature in database
GPG Key ID: 21FBDDF664FF06F8
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mirai-core/src/commonMain/kotlin/network/QQAndroidBotNetworkHandler.kt
View File

@ -25,10 +25,7 @@ import net.mamoe.mirai.Mirai
import net.mamoe.mirai.contact.deviceName import net.mamoe.mirai.contact.deviceName
import net.mamoe.mirai.contact.platform import net.mamoe.mirai.contact.platform
import net.mamoe.mirai.event.* import net.mamoe.mirai.event.*
import net.mamoe.mirai.event.events.BotOfflineEvent import net.mamoe.mirai.event.events.*
import net.mamoe.mirai.event.events.BotOnlineEvent
import net.mamoe.mirai.event.events.BotReloginEvent
import net.mamoe.mirai.event.events.MessageEvent
import net.mamoe.mirai.internal.QQAndroidBot import net.mamoe.mirai.internal.QQAndroidBot
import net.mamoe.mirai.internal.contact.* import net.mamoe.mirai.internal.contact.*
import net.mamoe.mirai.internal.createOtherClient import net.mamoe.mirai.internal.createOtherClient
@ -667,10 +664,20 @@ internal class QQAndroidBotNetworkHandler(coroutineContext: CoroutineContext, bo
} }
if (packet is Event) { if (packet is Event) {
if (packet is BroadcastControllable) { if ((packet as? BroadcastControllable)?.shouldBroadcast != false) {
if (packet.shouldBroadcast) packet.broadcast() if (packet is BotEvent) {
} else { withContext(bot.coroutineContext[CoroutineExceptionHandler] ?: CoroutineExceptionHandler { _, t ->
packet.broadcast() bot.logger.warning(
"""
Event processing: An exception occurred but no CoroutineExceptionHandler found in coroutineContext of bot
""".trimIndent(), t
)
}) {
packet.broadcast()
}
} else {
packet.broadcast()
}
} }
if (packet is CancellableEvent && packet.isCancelled) return if (packet is CancellableEvent && packet.isCancelled) return