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

Better double check when starting up to see if aeron is already running

Browse Source
This commit is contained in:
Robinson 2023-07-03 00:54:44 +02:00
parent b69c199bf4
commit eeeeed81aa
No known key found for this signature in database
GPG Key ID: 8E7DB78588BD6F5C
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/dorkbox/network/aeron/AeronContext.kt
View File

@ -140,7 +140,7 @@ internal class AeronContext(config: Configuration.MediaDriverConfig, aeronErrorH
// we ONLY do this during the initial startup check because it will delete the directory, and we don't always want to do this.
//
val isRunning = try {
var isRunning = try {
context.isDriverActive(driverTimeout) { }
} catch (e: DriverTimeoutException) {
// we have to delete the directory, since it was corrupted, and we try again.
@ -171,7 +171,19 @@ internal class AeronContext(config: Configuration.MediaDriverConfig, aeronErrorH
Thread.sleep(timeoutInNanos)
}
require(config.forceAllowSharedAeronDriver) { "Aeron is currently running, and this is the first instance created by this JVM. " +
isRunning = try {
context.isDriverActive(driverTimeout) { }
} catch (e: DriverTimeoutException) {
// we have to delete the directory, since it was corrupted, and we try again.
if (aeronDir.deleteRecursively()) {
context.isDriverActive(driverTimeout) { }
} else {
// unable to delete the directory
throw e
}
}
require(!isRunning || config.forceAllowSharedAeronDriver) { "Aeron is currently running, and this is the first instance created by this JVM. " +
"You must use `config.forceAllowSharedAeronDriver` to be able to re-use a shared aeron process at: $aeronDir" }
}