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

Config file and base dir can be specified together (#3783)

Browse Source
This commit is contained in:
Thomas Schroeter 2018-08-14 12:13:22 +01:00 committed by GitHub
parent 753d67a519
commit 7ec41fba43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
node/src/main/kotlin/net/corda/node/NodeArgsParser.kt
View File

@ -61,11 +61,10 @@ class NodeArgsParser : AbstractArgsParser<CmdLineOptions>() {
override fun doParse(optionSet: OptionSet): CmdLineOptions { override fun doParse(optionSet: OptionSet): CmdLineOptions {
require(optionSet.nonOptionArguments().isEmpty()) { "Unrecognized argument(s): ${optionSet.nonOptionArguments().joinToString(separator = ", ")}"} require(optionSet.nonOptionArguments().isEmpty()) { "Unrecognized argument(s): ${optionSet.nonOptionArguments().joinToString(separator = ", ")}"}
require(!optionSet.has(baseDirectoryArg) || !optionSet.has(configFileArg)) {
"${baseDirectoryArg.options()[0]} and ${configFileArg.options()[0]} cannot be specified together"
}
val baseDirectory = optionSet.valueOf(baseDirectoryArg).normalize().toAbsolutePath() val baseDirectory = optionSet.valueOf(baseDirectoryArg).normalize().toAbsolutePath()
val configFile = baseDirectory / optionSet.valueOf(configFileArg) val configFilePath = Paths.get(optionSet.valueOf(configFileArg))
val configFile = if (configFilePath.isAbsolute) configFilePath else baseDirectory / configFilePath.toString()
val loggingLevel = optionSet.valueOf(loggerLevel) val loggingLevel = optionSet.valueOf(loggerLevel)
val logToConsole = optionSet.has(logToConsoleArg) val logToConsole = optionSet.has(logToConsoleArg)
val isRegistration = optionSet.has(isRegistrationArg) val isRegistration = optionSet.has(isRegistrationArg)

7
node/src/test/kotlin/net/corda/node/NodeArgsParserTest.kt
View File

@ -80,13 +80,6 @@ class NodeArgsParserTest {
assertThat(cmdLineOptions.configFile).isEqualTo(configFile) assertThat(cmdLineOptions.configFile).isEqualTo(configFile)
} }
@Test
fun `both base-directory and config-file`() {
assertThatExceptionOfType(IllegalArgumentException::class.java).isThrownBy {
parser.parse("--base-directory", "base", "--config-file", "conf")
}.withMessageContaining("base-directory").withMessageContaining("config-file")
}
@Test @Test
fun `base-directory without argument`() { fun `base-directory without argument`() {
assertThatExceptionOfType(OptionException::class.java).isThrownBy { assertThatExceptionOfType(OptionException::class.java).isThrownBy {