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

Remove leftover debugging code

This commit is contained in:
Ryan Ernst 2015-11-29 19:50:09 -08:00
parent 0fa05edf03
commit d37930d133
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java
View File

@ -249,7 +249,6 @@ final class Bootstrap {
BootstrapCLIParser bootstrapCLIParser = new BootstrapCLIParser(); BootstrapCLIParser bootstrapCLIParser = new BootstrapCLIParser();
CliTool.ExitStatus status = bootstrapCLIParser.execute(args); CliTool.ExitStatus status = bootstrapCLIParser.execute(args);
exit(1);
if (CliTool.ExitStatus.OK != status) { if (CliTool.ExitStatus.OK != status) {
exit(status.status()); exit(status.status());
} }

5
core/src/main/java/org/elasticsearch/env/Environment.java vendored
View File

@ -23,8 +23,6 @@ import org.apache.lucene.util.Constants;
import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterName;
import org.elasticsearch.common.SuppressForbidden; import org.elasticsearch.common.SuppressForbidden;
import org.elasticsearch.common.io.PathUtils; import org.elasticsearch.common.io.PathUtils;
import org.elasticsearch.common.logging.ESLogger;
import org.elasticsearch.common.logging.ESLoggerFactory;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import java.io.IOException; import java.io.IOException;
@ -101,13 +99,10 @@ public class Environment {
throw new IllegalStateException("path.home is not configured"); throw new IllegalStateException("path.home is not configured");
} }
ESLogger logger = ESLoggerFactory.getLogger("env");
if (settings.get("path.conf") != null) { if (settings.get("path.conf") != null) {
configFile = PathUtils.get(cleanPath(settings.get("path.conf"))); configFile = PathUtils.get(cleanPath(settings.get("path.conf")));
logger.info("Using path.conf: " + configFile);
} else { } else {
configFile = homeFile.resolve("config"); configFile = homeFile.resolve("config");
logger.info("Using default path.conf: " + configFile);
} }
if (settings.get("path.scripts") != null) { if (settings.get("path.scripts") != null) {