ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-04-29 15:30:10 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

CORDA-742 PR #1951 Moved extension methods into node.

Browse Source
This commit is contained in:
Mat Rizzo 2017-10-26 16:29:45 +01:00 committed by mat-rizzo-r3
parent a3c553d44a
commit 92bbce711b
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gradle-plugins/cordformation/src/main/kotlin/net/corda/plugins/Cordform.kt
View File

@ -183,7 +183,7 @@ open class Cordform : DefaultTask() {
// InheritIO causes hangs on windows due the gradle buffer also not being flushed. // InheritIO causes hangs on windows due the gradle buffer also not being flushed.
// Must redirect to output or logger (node log is still written, this is just startup banner) // Must redirect to output or logger (node log is still written, this is just startup banner)
.redirectOutput(node.logFile().toFile()) .redirectOutput(node.logFile().toFile())
.addEnvironment("CAPSULE_CACHE_DIR", capsuleCacheDir) .addEnvironment("CAPSULE_CACHE_DIR", Node.capsuleCacheDir)
.start() .start()
return Pair(node, process) return Pair(node, process)
} }
@ -191,7 +191,7 @@ open class Cordform : DefaultTask() {
private fun generateNodeInfoCommand(): List<String> = listOf( private fun generateNodeInfoCommand(): List<String> = listOf(
"java", "java",
"-Dcapsule.log=verbose", "-Dcapsule.log=verbose",
"-Dcapsule.dir=$capsuleCacheDir", "-Dcapsule.dir=${Node.capsuleCacheDir}",
"-jar", "-jar",
Node.nodeJarName, Node.nodeJarName,
"--just-generate-node-info" "--just-generate-node-info"
@ -225,10 +225,5 @@ open class Cordform : DefaultTask() {
} }
} }
private const val capsuleCacheDir: String = "./cache"
private fun Node.fullPath(): Path = project.projectDir.toPath().resolve(this.nodeDir.toPath())
private fun Node.logDirectory(): Path = this.fullPath().resolve("logs")
private fun Node.makeLogDirectory() = Files.createDirectories(this.logDirectory())
private fun Node.logFile(): Path = this.logDirectory().resolve("generate-info.log")
private fun ProcessBuilder.addEnvironment(key: String, value: String) = this.apply { environment().put(key, value) } private fun ProcessBuilder.addEnvironment(key: String, value: String) = this.apply { environment().put(key, value) }
} }

6
gradle-plugins/cordformation/src/main/kotlin/net/corda/plugins/Node.kt
View File

@ -21,8 +21,14 @@ class Node(private val project: Project) : CordformNode() {
@JvmStatic @JvmStatic
val webJarName = "corda-webserver.jar" val webJarName = "corda-webserver.jar"
private val configFileProperty = "configFile" private val configFileProperty = "configFile"
val capsuleCacheDir: String = "./cache"
} }
fun fullPath(): Path = project.projectDir.toPath().resolve(this.nodeDir.toPath())
fun logDirectory(): Path = this.fullPath().resolve("logs")
fun makeLogDirectory() = Files.createDirectories(this.logDirectory())
fun logFile(): Path = this.logDirectory().resolve("generate-info.log")
/** /**
* Set the list of CorDapps to install to the plugins directory. Each cordapp is a fully qualified Maven * Set the list of CorDapps to install to the plugins directory. Each cordapp is a fully qualified Maven
* dependency name, eg: com.example:product-name:0.1 * dependency name, eg: com.example:product-name:0.1