dorkbox/Network
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Endpoint RuntimeShutdown hook is in a try/catch now

Browse Source
This commit is contained in:
Robinson 2023-06-29 20:57:01 +02:00
parent ae67bb4899
commit daa0d14e2b
No known key found for this signature in database
GPG Key ID: 8E7DB78588BD6F5C
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/dorkbox/network/connection/EndPoint.kt
View File

@ -901,11 +901,15 @@ abstract class EndPoint<CONNECTION : Connection> private constructor(val type: C
*
* @param closeEverything unless explicitly called, this is only false when a connection is closed in the client.
*/
internal suspend fun closeSuspending(closeEverything: Boolean, initiatedByShutdown: Boolean = false) {
internal suspend fun closeSuspending(
closeEverything: Boolean,
initiatedByClientClose: Boolean = false,
initiatedByShutdown: Boolean = false)
{
// 1) endpoints can call close()
// 2) client can close the endpoint if the connection is D/C from aeron (and the endpoint was not closed manually)
val shutdownPreviouslyStarted = shutdownInProgress.getAndSet(true)
if (shutdownPreviouslyStarted && closeEverything) {
if (closeEverything && shutdownPreviouslyStarted) {
// this is only called when the client network event poller shuts down
// if we have clientConnectionClosed, then run that logic (because it doesn't run on the client when the connection is closed remotely)
@ -922,7 +926,10 @@ abstract class EndPoint<CONNECTION : Connection> private constructor(val type: C
}
if (!shutdownPreviouslyStarted && initiatedByShutdown) {
Runtime.getRuntime().removeShutdownHook(hook)
try {
Runtime.getRuntime().removeShutdownHook(hook)
} catch (ignored: Exception) {
}
}
EventDispatcher.CLOSE.launch {
@ -937,7 +944,7 @@ abstract class EndPoint<CONNECTION : Connection> private constructor(val type: C
}
// don't do these things if we are "closed" from a client connection disconnect
if (closeEverything && !shutdownPreviouslyStarted) {
if (closeEverything && !initiatedByClientClose) {
// THIS WILL SHUT DOWN THE EVENT POLLER IMMEDIATELY! BUT IN AN ASYNC MANNER!
shutdownEventPoller = true
// if we close the poller AND listener manager too quickly, events will not get published