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

Fix HB logic: catch TimeoutCancellationException from HB action and report it as non-fatal error. Fix #2024

Browse Source
This commit is contained in:
Him188 2022-05-09 08:58:47 +01:00
parent 71fb5585fe
commit 0d3bc9c684
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mirai-core/src/commonMain/kotlin/network/components/HeartbeatScheduler.kt
View File

@ -114,18 +114,26 @@ internal class TimeBasedHeartbeatSchedulerImpl(
} }
try { try {
val result = withTimeoutOrNull(timeout()) { action() } var cause: Throwable? = null
val result = try {
withTimeoutOrNull(timeout()) { action() }
} catch (e: TimeoutCancellationException) {
// from `action`
cause = e
null
}
if (result == null) { if (result == null) {
onHeartFailure( onHeartFailure(
name, name,
PacketTimeoutException( PacketTimeoutException(
"$coroutineName: Timeout receiving action response", "$coroutineName: Timeout receiving action response",
CancellationException("Dummy exception for stacktrace") cause
) // This is a NetworkException that is recoverable ) // This is a NetworkException that is recoverable
) )
return@async return@async
} }
} catch (e: Throwable) { } catch (e: Throwable) {
// catch other errors
onHeartFailure( onHeartFailure(
name, name,
IllegalStateException("$coroutineName: Internal error: caught unexpected exception", e) IllegalStateException("$coroutineName: Internal error: caught unexpected exception", e)