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

Improve logs on event exception

Browse Source
This commit is contained in:
Him188 2021-04-29 12:30:37 +08:00
parent 70dc0a4da6
commit c7dfef9ad5
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mirai-core-api/src/commonMain/kotlin/internal/event/InternalEventListeners.kt
View File

@ -18,7 +18,6 @@ import net.mamoe.mirai.utils.MiraiLogger
import java.util.* import java.util.*
import java.util.concurrent.ConcurrentLinkedQueue import java.util.concurrent.ConcurrentLinkedQueue
import kotlin.coroutines.CoroutineContext import kotlin.coroutines.CoroutineContext
import kotlin.coroutines.coroutineContext
import kotlin.reflect.KClass import kotlin.reflect.KClass
@ -49,14 +48,16 @@ internal class Handler<in E : Event> internal constructor(
withContext(subscriberContext) { handler.invoke(event) }.also { if (it == ListeningStatus.STOPPED) this.complete() } withContext(subscriberContext) { handler.invoke(event) }.also { if (it == ListeningStatus.STOPPED) this.complete() }
} catch (e: Throwable) { } catch (e: Throwable) {
subscriberContext[CoroutineExceptionHandler]?.handleException(subscriberContext, e) subscriberContext[CoroutineExceptionHandler]?.handleException(subscriberContext, e)
?: coroutineContext[CoroutineExceptionHandler]?.handleException(subscriberContext, e) ?: currentCoroutineContext()[CoroutineExceptionHandler]?.handleException(subscriberContext, e)
?: kotlin.run { ?: kotlin.run {
@Suppress("DEPRECATION") val logger = if (event is BotEvent) event.bot.logger else MiraiLogger.TopLevel
(if (event is BotEvent) event.bot.logger else MiraiLogger.TopLevel) val subscriberName = subscriberContext[CoroutineName]?.name ?: "<unnamed>"
.warning( val broadcasterName = currentCoroutineContext()[CoroutineName]?.name ?: "<unnamed>"
"""Event processing: An exception occurred but no CoroutineExceptionHandler found, val message =
either in coroutineContext from Handler job, or in subscriberContext""".trimIndent(), e "An exception occurred when processing event. " +
) "Subscriber scope: '$subscriberName'. " +
"Broadcaster scope: '$broadcasterName'"
logger.warning(message, e)
} }
// this.complete() // do not `completeExceptionally`, otherwise parentJob will fai`l. // this.complete() // do not `completeExceptionally`, otherwise parentJob will fai`l.
// ListeningStatus.STOPPED // ListeningStatus.STOPPED