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

SQL: Remove cli.debug system parameter (elastic/x-pack-elasticsearch#3722) 

This was requested for removal in
https://github.com/elastic/x-pack-elasticsearch/pull/3686#discussion_r163286953
and is a followup for that.

Original commit: elastic/x-pack-elasticsearch@6134693a34
This commit is contained in:
Lee Hinman 2018-01-25 10:51:12 -07:00 committed by GitHub
parent 4d213666d5
commit dc40562be6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,7 +81,7 @@ public class Cli extends LoggingAwareCommand {
@Override @Override
protected void execute(org.elasticsearch.cli.Terminal terminal, OptionSet options) throws Exception { protected void execute(org.elasticsearch.cli.Terminal terminal, OptionSet options) throws Exception {
boolean debug = Boolean.parseBoolean(System.getProperty("cli.debug", "false")) || options.has("d") || options.has("debug"); boolean debug = options.has("d") || options.has("debug");
boolean checkConnection = checkOption.value(options); boolean checkConnection = checkOption.value(options);
List<String> args = connectionString.values(options); List<String> args = connectionString.values(options);
if (args.size() > 1) { if (args.size() > 1) {

2
test/sql-cli-fixture/src/main/java/org/elasticsearch/xpack/sql/cli/fixture/CliFixture.java
View File

@ -89,7 +89,6 @@ public class CliFixture {
} }
List<String> command = new ArrayList<>(); List<String> command = new ArrayList<>();
command.add(javaExecutable.toString()); command.add(javaExecutable.toString());
command.add("-Dcli.debug=true");
// command.add("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000"); // command.add("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000");
// Force a specific terminal type so we have consistent responses for testing. // Force a specific terminal type so we have consistent responses for testing.
command.add("-Dorg.jline.terminal.type=xterm-256color"); command.add("-Dorg.jline.terminal.type=xterm-256color");
@ -100,6 +99,7 @@ public class CliFixture {
command.add("-Dorg.jline.terminal.dumb=true"); command.add("-Dorg.jline.terminal.dumb=true");
command.add("-jar"); command.add("-jar");
command.add(cliJar.toString()); command.add(cliJar.toString());
command.add("-d");
command.addAll(Arrays.asList(line.split(" "))); command.addAll(Arrays.asList(line.split(" ")));
ProcessBuilder cliBuilder = new ProcessBuilder(command); ProcessBuilder cliBuilder = new ProcessBuilder(command);
// Clear the environment to drop JAVA_TOOLS which prints strange things on startup // Clear the environment to drop JAVA_TOOLS which prints strange things on startup