ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-22 17:09:00 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

node: Add quasarPath parameter to driver dsl (should be replaced once we can do without the external quasar.jar)

Browse Source
This commit is contained in:
Andras Slemmer
2016-08-01 14:06:35 +01:00
parent a317a5bfd2
commit 5f5a5e683d
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
node/src/main/kotlin/com/r3corda/node/driver/Driver.kt
View File

@ -44,8 +44,12 @@ interface DriverDSLInterface {
fun startNode(advertisedServices: Set<ServiceType>, providedName: String? = null): NodeInfo fun startNode(advertisedServices: Set<ServiceType>, providedName: String? = null): NodeInfo
} }
fun <A> driver(baseDirectory: String? = null, dsl: DriverDSL.() -> A): Pair<DriverHandle, A> { fun <A> driver(baseDirectory: String? = null, quasarPath: String? = null, dsl: DriverDSL.() -> A): Pair<DriverHandle, A> {
val driverDsl = DriverDSL(10000, baseDirectory ?: "build/${getTimestampAsDirectoryName()}") val driverDsl = DriverDSL(
portCounter = 10000,
baseDirectory = baseDirectory ?: "build/${getTimestampAsDirectoryName()}",
quasarPath = quasarPath ?: "lib/quasar.jar"
)
driverDsl.start() driverDsl.start()
val returnValue = dsl(driverDsl) val returnValue = dsl(driverDsl)
val shutdownHook = Thread({ val shutdownHook = Thread({
@ -89,7 +93,7 @@ private fun <A> poll(f: () -> A?): A {
return result return result
} }
class DriverDSL(private var portCounter: Int, val baseDirectory: String) : DriverDSLInterface { class DriverDSL(private var portCounter: Int, val baseDirectory: String, val quasarPath: String) : DriverDSLInterface {
fun nextLocalHostAndPort() = HostAndPort.fromParts("localhost", nextPort()) fun nextLocalHostAndPort() = HostAndPort.fromParts("localhost", nextPort())
@ -159,7 +163,7 @@ class DriverDSL(private var portCounter: Int, val baseDirectory: String) : Drive
nearestCity = nearestCity, nearestCity = nearestCity,
legalName = name legalName = name
) )
registerProcess(startNode(driverCliParams)) registerProcess(startNode(driverCliParams, quasarPath))
return poll { return poll {
networkMapCache.partyNodes.forEach { networkMapCache.partyNodes.forEach {
@ -190,7 +194,7 @@ class DriverDSL(private var portCounter: Int, val baseDirectory: String) : Drive
legalName = networkMapName legalName = networkMapName
) )
println("Starting network-map-service") println("Starting network-map-service")
registerProcess(startNode(driverCliParams)) registerProcess(startNode(driverCliParams, quasarPath))
// We fake the network map's NodeInfo with a random public key in order to retrieve the correct NodeInfo from // We fake the network map's NodeInfo with a random public key in order to retrieve the correct NodeInfo from
// the network map service itself // the network map service itself
val nodeInfo = NodeInfo( val nodeInfo = NodeInfo(
@ -228,13 +232,13 @@ class DriverDSL(private var portCounter: Int, val baseDirectory: String) : Drive
) )
fun <A> pickA(array: Array<A>): A = array[Math.abs(Random().nextInt()) % array.size] fun <A> pickA(array: Array<A>): A = array[Math.abs(Random().nextInt()) % array.size]
private fun startNode(cliParams: NodeRunner.CliParams): Process { private fun startNode(cliParams: NodeRunner.CliParams, quasarPath: String): Process {
val className = NodeRunner::class.java.canonicalName val className = NodeRunner::class.java.canonicalName
val separator = System.getProperty("file.separator") val separator = System.getProperty("file.separator")
val classpath = System.getProperty("java.class.path") val classpath = System.getProperty("java.class.path")
val path = System.getProperty("java.home") + separator + "bin" + separator + "java" val path = System.getProperty("java.home") + separator + "bin" + separator + "java"
val javaArgs = listOf(path) + val javaArgs = listOf(path) +
listOf("-Dname=${cliParams.legalName}", "-javaagent:lib/quasar.jar", "-cp", classpath, className) + listOf("-Dname=${cliParams.legalName}", "-javaagent:$quasarPath", "-cp", classpath, className) +
cliParams.toCliArguments() cliParams.toCliArguments()
val builder = ProcessBuilder(javaArgs) val builder = ProcessBuilder(javaArgs)
builder.redirectError(Paths.get("error.$className.log").toFile()) builder.redirectError(Paths.get("error.$className.log").toFile())