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

Cleaned up close methods

Browse Source
This commit is contained in:
Robinson 2022-08-10 14:45:16 +02:00
parent a34308ea07
commit 2ef56be699
No known key found for this signature in database
GPG Key ID: 8E7DB78588BD6F5C
2 changed files with 33 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dorkbox/network/Server.kt
View File

@ -398,7 +398,7 @@ open class Server<CONNECTION : Connection>(
* Closes the server and all it's connections. After a close, you may call 'bind' again.
*/
final override fun close0() {
// when we call close, it will shutdown the polling mechanism, then wait for us to tell it to cleanup connections.
// when we call close, it will shut-down the polling mechanism, then wait for us to tell it to clean-up connections.
//
// Aeron + the Media Driver will have already been shutdown at this point.
if (bindAlreadyCalled.getAndSet(false)) {

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

@ -903,38 +903,19 @@ internal constructor(val type: Class<*>,
if (shutdown.compareAndSet(expect = false, update = true)) {
logger.info { "Shutting down..." }
// the server has to be able to call server.notifyDisconnect() on a list of connections. If we remove the connections
// inside of connection.close(), then the server does not have a list of connections to call the global notifyDisconnect()
val enableRemove = type == Client::class.java
connections.forEach {
logger.info { "[${it.id}/${it.streamId}] Closing connection" }
it.close(enableRemove)
}
runBlocking {
// Connections are closed first, because we want to make sure that no RMI messages can be received
closeAction {
// Connections MUST be closed first, because we want to make sure that no RMI messages can be received
// when we close the RMI support objects (in which case, weird - but harmless - errors show up)
// this will wait for RMI timeouts if there are RMI in-progress. (this happens if we close via and RMI method)
// this will wait for RMI timeouts if there are RMI in-progress. (this happens if we close via an RMI method)
responseManager.close()
}
// the storage is closed via this as well.
storage.close()
close0()
aeronDriver.close()
shutdownLatch = CountDownLatch(1)
// if we are waiting for shutdown, cancel the waiting thread (since we have shutdown now)
shutdownLatch.countDown()
}
logger.info { "Done shutting down..." }
}
}
/**
* Close in such a way that we enable us to be restarted. This is the same as a "normal close", but DOES NOT close
* - response manager
@ -944,7 +925,13 @@ internal constructor(val type: Class<*>,
if (shutdown.compareAndSet(expect = false, update = true)) {
logger.info { "Shutting down for restart..." }
closeAction()
logger.info { "Done shutting down for restart..." }
}
}
private fun closeAction(extraActions: suspend () -> Unit = {}) {
// the server has to be able to call server.notifyDisconnect() on a list of connections. If we remove the connections
// inside of connection.close(), then the server does not have a list of connections to call the global notifyDisconnect()
val enableRemove = type == Client::class.java
@ -953,6 +940,11 @@ internal constructor(val type: Class<*>,
it.close(enableRemove)
}
// must run after connections have been closed, but before anything else
runBlocking {
extraActions()
}
close0()
aeronDriver.close()
@ -961,10 +953,8 @@ internal constructor(val type: Class<*>,
// if we are waiting for shutdown, cancel the waiting thread (since we have shutdown now)
shutdownLatch.countDown()
}
logger.info { "Done shutting down for restart..." }
}
}
internal open fun close0() {}