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

Working on merging changes to NodeConfigurationImpl.

Browse Source
This commit is contained in:
Michele Sollecito 2018-11-08 17:25:41 +00:00
parent 69921669e7
commit 545dd25ef3
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
View File

@ -141,9 +141,15 @@ data class DevModeOptions(val disableCheckpointChecker: Boolean = Defaults.disab
data class GraphiteOptions(
val server: String,
val port: Int,
val prefix: String? = null, // defaults to org name and ip address when null
val prefix: String? = Defaults.prefix, // defaults to org name and ip address when null
// This typo leaking in the node.conf is brilliant
val sampleInvervallSeconds: Long = Defaults.sampleInvervallSeconds
) {
internal object Defaults {
val prefix: String? = null
val sampleInvervallSeconds: Long = 60
)
}
}
fun NodeConfiguration.shouldCheckCheckpoints(): Boolean {
return this.devMode && this.devModeOptions?.disableCheckpointChecker != true

12
node/src/main/kotlin/net/corda/node/services/config/schema/v1/ConfigSections.kt
View File

@ -20,6 +20,7 @@ import net.corda.node.services.config.DevModeOptions
import net.corda.node.services.config.FlowOverride
import net.corda.node.services.config.FlowOverrideConfig
import net.corda.node.services.config.FlowTimeoutConfiguration
import net.corda.node.services.config.GraphiteOptions
import net.corda.node.services.config.NetworkServicesConfig
import net.corda.node.services.config.NodeH2Settings
import net.corda.node.services.config.NodeRpcSettings
@ -250,4 +251,15 @@ internal object RelayConfigurationSpec : Configuration.Specification<RelayConfig
override fun parseValid(configuration: Config): Valid<RelayConfiguration> {
return valid(RelayConfiguration(configuration[relayHost], configuration[remoteInboundPort], configuration[username], configuration[privateKeyFile], configuration[publicKeyFile], configuration[sshPort]))
}
}
internal object GraphiteOptionsSpec : Configuration.Specification<GraphiteOptions>("GraphiteOptions") {
private val server by string()
private val port by int()
private val prefix by string().optional()
private val sampleInvervallSeconds by long().optional().withDefaultValue(GraphiteOptions.Defaults.sampleInvervallSeconds)
override fun parseValid(configuration: Config): Valid<GraphiteOptions> {
return valid(GraphiteOptions(configuration[server], configuration[port], configuration[prefix], configuration[sampleInvervallSeconds]))
}
}

4
node/src/main/kotlin/net/corda/node/services/config/schema/v1/V1NodeConfigurationSpec.kt
View File

@ -81,6 +81,7 @@ internal object V1NodeConfigurationSpec : Configuration.Specification<NodeConfig
private val relay by nested(RelayConfigurationSpec).optional()
private val enableSNI by boolean().optional().withDefaultValue(Defaults.enableSNI)
private val useOpenSsl by boolean().optional().withDefaultValue(Defaults.useOpenSsl)
private val graphiteOptions by nested(GraphiteOptionsSpec).optional()
override fun parseValid(configuration: Config): Valid<NodeConfiguration> {
@ -139,7 +140,8 @@ internal object V1NodeConfigurationSpec : Configuration.Specification<NodeConfig
cryptoServiceConf = configuration[cryptoServiceConf],
relay = configuration[relay],
enableSNI = configuration[enableSNI],
useOpenSsl = configuration[useOpenSsl]
useOpenSsl = configuration[useOpenSsl],
graphiteOptions = configuration[graphiteOptions]
))
} catch (e: Exception) {
return when (e) {