ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-19 15:43:52 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Allow base dir and config file (#1331)

Browse Source
This commit is contained in:
Thomas Schroeter
2018-08-17 13:55:41 +01:00
committed by GitHub
parent f2dbc3e662
commit 047489ba7e
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bridge/src/main/kotlin/net/corda/bridge/FirewallArgsParser.kt
View File

@ -45,11 +45,9 @@ class ArgsParser {
fun parse(vararg args: String): CmdLineOptions { fun parse(vararg args: String): CmdLineOptions {
val optionSet = optionParser.parse(*args) val optionSet = optionParser.parse(*args)
require(!optionSet.has(baseDirectoryArg) || !optionSet.has(configFileArg)) {
"${baseDirectoryArg.options()[0]} and ${configFileArg.options()[0]} cannot be specified together"
}
val baseDirectory = Paths.get(optionSet.valueOf(baseDirectoryArg)).normalize().toAbsolutePath() val baseDirectory = Paths.get(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 help = optionSet.has(helpArg) val help = optionSet.has(helpArg)
val loggingLevel = optionSet.valueOf(loggerLevel) val loggingLevel = optionSet.valueOf(loggerLevel)
val logToConsole = optionSet.has(logToConsoleArg) val logToConsole = optionSet.has(logToConsoleArg)