ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-03-23 12:35:23 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

CORDA-742 Minor refactor

Browse Source
This commit is contained in:
Mat Rizzo 2017-10-26 11:48:15 +01:00 committed by mat-rizzo-r3
parent ac1dfec1ff
commit 788d8ef65f
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -152,10 +152,10 @@ open class Cordform : DefaultTask() {
project.logger.info("Generating node infos") project.logger.info("Generating node infos")
var nodeProcesses = buildNodeProcesses() var nodeProcesses = buildNodeProcesses()
try { try {
nodeProcesses.forEach { (node, process) -> validateNodeProcess(node, process) } validateNodeProcessess(nodeProcesses)
} }
finally { finally {
nodeProcesses.forEach { it.second.destroyForcibly() } destroyNodeProcesses(nodeProcesses)
} }
} }
@ -163,6 +163,14 @@ open class Cordform : DefaultTask() {
return nodes.map { buildNodeProcess(it, makeLogDirectory(it)) } return nodes.map { buildNodeProcess(it, makeLogDirectory(it)) }
} }
private fun validateNodeProcessess(processes: List<Pair<Node, Process>>) {
nodeProcesses.forEach { (node, process) -> validateNodeProcess(node, process) }
}
private fun destroyNodeProcesses(processes: List<Pair<Node, Process>>) {
nodeProcesses.forEach { it.second.destroyForcibly() }
}
private fun makeLogDirectory(node: Node): File { private fun makeLogDirectory(node: Node): File {
var logDir = File(fullNodePath(node).toFile(), "logs") var logDir = File(fullNodePath(node).toFile(), "logs")
logDir.mkdirs() logDir.mkdirs()