Removed unnecessary config for webserver.

This commit is contained in:
Clinton Alexander 2017-03-30 14:33:26 +01:00
parent 561b2e50a6
commit 27e7a4226e

View File

@ -32,10 +32,6 @@ class ArgsParser {
.withValuesConvertedBy(object : EnumConverter<Level>(Level::class.java) {}) .withValuesConvertedBy(object : EnumConverter<Level>(Level::class.java) {})
.defaultsTo(Level.INFO) .defaultsTo(Level.INFO)
private val logToConsoleArg = optionParser.accepts("log-to-console", "If set, prints logging to the console as well as to a file.") private val logToConsoleArg = optionParser.accepts("log-to-console", "If set, prints logging to the console as well as to a file.")
private val sshdServerArg = optionParser.accepts("sshd", "Enables SSHD server for node administration.")
private val noLocalShellArg = optionParser.accepts("no-local-shell", "Do not start the embedded shell locally.")
private val isRegistrationArg = optionParser.accepts("initial-registration", "Start initial node registration with Corda network to obtain certificate from the permissioning server.")
private val isVersionArg = optionParser.accepts("version", "Print the version and exit")
private val helpArg = optionParser.accepts("help").forHelp() private val helpArg = optionParser.accepts("help").forHelp()
fun parse(vararg args: String): CmdLineOptions { fun parse(vararg args: String): CmdLineOptions {
@ -48,11 +44,7 @@ class ArgsParser {
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)
val isRegistration = optionSet.has(isRegistrationArg) return CmdLineOptions(baseDirectory, configFile, help, loggingLevel, logToConsole)
val isVersion = optionSet.has(isVersionArg)
val noLocalShell = optionSet.has(noLocalShellArg)
val sshdServer = optionSet.has(sshdServerArg)
return CmdLineOptions(baseDirectory, configFile, help, loggingLevel, logToConsole, isRegistration, isVersion, noLocalShell, sshdServer)
} }
fun printHelp(sink: PrintStream) = optionParser.printHelpOn(sink) fun printHelp(sink: PrintStream) = optionParser.printHelpOn(sink)
@ -62,11 +54,7 @@ data class CmdLineOptions(val baseDirectory: Path,
val configFile: Path, val configFile: Path,
val help: Boolean, val help: Boolean,
val loggingLevel: Level, val loggingLevel: Level,
val logToConsole: Boolean, val logToConsole: Boolean) {
val isRegistration: Boolean,
val isVersion: Boolean,
val noLocalShell: Boolean,
val sshdServer: Boolean) {
private val log = loggerFor<CmdLineOptions>() private val log = loggerFor<CmdLineOptions>()