CORDA-742 Minor refactor

This commit is contained in:
Mat Rizzo 2017-10-26 11:48:15 +01:00 committed by mat-rizzo-r3
parent ac1dfec1ff
commit 788d8ef65f

View File

@ -152,10 +152,10 @@ open class Cordform : DefaultTask() {
project.logger.info("Generating node infos")
var nodeProcesses = buildNodeProcesses()
try {
nodeProcesses.forEach { (node, process) -> validateNodeProcess(node, process) }
validateNodeProcessess(nodeProcesses)
}
finally {
nodeProcesses.forEach { it.second.destroyForcibly() }
destroyNodeProcesses(nodeProcesses)
}
}
@ -163,6 +163,14 @@ open class Cordform : DefaultTask() {
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 {
var logDir = File(fullNodePath(node).toFile(), "logs")
logDir.mkdirs()