ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-30 16:14:39 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixed an issue with the port allocation. (#4418)

Browse Source
This commit is contained in:
Michele Sollecito 2018-12-14 13:18:01 +00:00 committed by GitHub
parent 9cdda3bd77
commit f2b6f96486
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
testing/node-driver/src/main/kotlin/net/corda/testing/driver/internal/GlobalTestPortAllocation.kt
View File

@ -1,10 +1,6 @@
package net.corda.testing.driver.internal package net.corda.testing.driver.internal
import net.corda.testing.driver.PortAllocation import net.corda.testing.driver.PortAllocation
import net.corda.testing.driver.internal.GlobalTestPortAllocation.enablingEnvVar
import net.corda.testing.driver.internal.GlobalTestPortAllocation.enablingSystemProperty
import net.corda.testing.driver.internal.GlobalTestPortAllocation.startingPortEnvVariable
import net.corda.testing.driver.internal.GlobalTestPortAllocation.startingPortSystemProperty
fun incrementalPortAllocation(startingPortIfNoEnv: Int): PortAllocation { fun incrementalPortAllocation(startingPortIfNoEnv: Int): PortAllocation {
@ -14,13 +10,16 @@ fun incrementalPortAllocation(startingPortIfNoEnv: Int): PortAllocation {
} }
} }
private object GlobalTestPortAllocation : PortAllocation.Incremental(startingPort = startingPort) { private object GlobalTestPortAllocation : PortAllocation.Incremental(startingPort = startingPort())
const val enablingEnvVar = "CORDA_TEST_GLOBAL_PORT_ALLOCATION_ENABLED" private const val enablingEnvVar = "CORDA_TEST_GLOBAL_PORT_ALLOCATION_ENABLED"
const val startingPortEnvVariable = "CORDA_TEST_GLOBAL_PORT_ALLOCATION_STARTING_PORT" private const val startingPortEnvVariable = "CORDA_TEST_GLOBAL_PORT_ALLOCATION_STARTING_PORT"
val enablingSystemProperty = enablingEnvVar.toLowerCase().replace("_", ".") private val enablingSystemProperty = enablingEnvVar.toLowerCase().replace("_", ".")
val startingPortSystemProperty = startingPortEnvVariable.toLowerCase().replace("_", ".") private val startingPortSystemProperty = startingPortEnvVariable.toLowerCase().replace("_", ".")
const val startingPortDefaultValue = 5000 private const val startingPortDefaultValue = 5000
}
private val startingPort: Int = System.getProperty(startingPortSystemProperty)?.toIntOrNull() ?: System.getenv(startingPortEnvVariable)?.toIntOrNull() ?: GlobalTestPortAllocation.startingPortDefaultValue
private fun startingPort(): Int {
return System.getProperty(startingPortSystemProperty)?.toIntOrNull() ?: System.getenv(startingPortEnvVariable)?.toIntOrNull() ?: startingPortDefaultValue
}