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

Fix inheritance issue in NodeStartup

Browse Source
This commit is contained in:
Anthony Keenan 2018-10-25 13:22:32 +01:00
parent a74da313b6
commit 565f3efffb
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
View File

@ -60,10 +60,10 @@ abstract class NodeCliCommand(alias: String, description: String, val startup: N
open class NodeStartupCli : CordaCliWrapper("corda", "Runs a Corda Node") {
open val startup = NodeStartup()
private val networkCacheCli = ClearNetworkCacheCli(startup)
private val justGenerateNodeInfoCli = GenerateNodeInfoCli(startup)
private val justGenerateRpcSslCertsCli = GenerateRpcSslCertsCli(startup)
private val initialRegistrationCli = InitialRegistrationCli(startup)
private val networkCacheCli by lazy { ClearNetworkCacheCli(startup) }
private val justGenerateNodeInfoCli by lazy { GenerateNodeInfoCli(startup) }
private val justGenerateRpcSslCertsCli by lazy { GenerateRpcSslCertsCli(startup) }
private val initialRegistrationCli by lazy { InitialRegistrationCli(startup) }
override fun initLogging() = this.initLogging(cmdLineOptions.baseDirectory)
@ -418,7 +418,8 @@ interface NodeStartupLogging {
fun Exception.logAsExpected(message: String? = this.message, print: (String?) -> Unit = logger::error) = print(message)
fun Exception.logAsUnexpected(message: String? = this.message, error: Exception = this, print: (String?, Throwable) -> Unit = logger::error) = print("$message${this.message?.let { ": $it" } ?: ""}", error)
fun Exception.logAsUnexpected(message: String? = this.message, error: Exception = this, print: (String?, Throwable) -> Unit = logger::error) = print("$message${this.message?.let { ": $it" }
?: ""}", error)
fun handleRegistrationError(error: Exception) {
when (error) {