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

reworked how stopDriver operates

Browse Source
This commit is contained in:
nathan 2020-09-19 19:37:04 +02:00
parent 1703bc5449
commit 50783a7ae9
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/dorkbox/network/aeron/AeronConfig.kt
View File

@ -221,7 +221,6 @@ object AeronConfig {
fun startDriver(config: Configuration,
type: Class<*> = AeronConfig::class.java,
logger: KLogger = KotlinLogging.logger("AeronConfig")): MediaDriver? {
config.validate()
if (config.context == null) {
@ -269,7 +268,7 @@ object AeronConfig {
* NOTE: We must be *super* careful trying to delete directories, because if we have multiple AERON/MEDIA DRIVERS connected to the
* same directory, deleting the directory will cause any other aeron connection to fail! (which makes sense).
*/
internal fun stopDriver(mediaDriver: MediaDriver?, logger: KLogger = KotlinLogging.logger("AeronConfig")) {
internal suspend fun stopDriver(mediaDriver: MediaDriver?, logger: KLogger = KotlinLogging.logger("AeronConfig")) {
if (mediaDriver == null) {
return
}
@ -282,15 +281,19 @@ object AeronConfig {
try {
mediaDriver.close()
// on close, the publication CAN linger (in case a client goes away, and then comes back)
// AERON_PUBLICATION_LINGER_TIMEOUT, 5s by default (this can also be set as a URI param)
delay(5_000)
(context.sharedThreadFactory() as NamedThreadFactory).group.destroy()
// wait for the media driver to actually stop
var count = 10
while (count-- >= 0 && isRunning(context)) {
logger.warn { "Aeron Media driver still running. Waiting for it to stop. Trying $count more times." }
runBlocking {
delay(context.driverTimeoutMs())
}
delay(context.driverTimeoutMs())
}
} catch (e: Exception) {
logger.error("Error closing the media driver", e)

4
test/dorkboxTest/network/DisconnectReconnectTest.kt
View File

@ -123,7 +123,9 @@ class DisconnectReconnectTest : BaseTest() {
waitForThreads()
AeronConfig.stopDriver(mediaDriver)
runBlocking {
AeronConfig.stopDriver(mediaDriver)
}
System.err.println("Connection count (after reconnecting) is: " + reconnectCount.value)
Assert.assertEquals(4, reconnectCount.value)