honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Parse CLI's `-d` or `--debug` flag as turning on debug (elastic/x-pack-elasticsearch#3686) 

Previously in order to turn on debug mode for the CLI, a user needed to specify
`-d true`. You now only need to specify `-d` or `--debug` to turn on debug mode.

Resolves elastic/x-pack-elasticsearch#3315

Original commit: elastic/x-pack-elasticsearch@d5052059e6
This commit is contained in:
Lee Hinman 2018-01-23 15:40:43 -07:00 committed by GitHub
parent 0256f736e1
commit 9f8c8ef3e9
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugin/sql/sql-cli/src/main/java/org/elasticsearch/xpack/sql/cli/Cli.java
View File

@ -32,17 +32,13 @@ import java.util.List;
import java.util.logging.LogManager;
public class Cli extends LoggingAwareCommand {
private final OptionSpec<Boolean> debugOption;
private final OptionSpec<String> keystoreLocation;
private final OptionSpec<Boolean> checkOption;
private final OptionSpec<String> connectionString;
private Cli() {
super("Elasticsearch SQL CLI");
this.debugOption = parser.acceptsAll(Arrays.asList("d", "debug"),
"Enable debug logging")
.withRequiredArg().ofType(Boolean.class)
.defaultsTo(Boolean.parseBoolean(System.getProperty("cli.debug", "false")));
parser.acceptsAll(Arrays.asList("d", "debug"), "Enable debug logging");
this.keystoreLocation = parser.acceptsAll(
Arrays.asList("k", "keystore_location"),
"Location of a keystore to use when setting up SSL. "
@ -85,7 +81,7 @@ public class Cli extends LoggingAwareCommand {
@Override
protected void execute(org.elasticsearch.cli.Terminal terminal, OptionSet options) throws Exception {
boolean debug = debugOption.value(options);
boolean debug = Boolean.parseBoolean(System.getProperty("cli.debug", "false")) || options.has("d") || options.has("debug");
boolean checkConnection = checkOption.value(options);
List<String> args = connectionString.values(options);
if (args.size() > 1) {