honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-17 10:25:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove the jline flag and automatically detect it

Browse Source
This commit is contained in:
kimchy 2011-07-15 10:00:23 +03:00
parent f6beebf34c
commit 845104dabc
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/elasticsearch.bat
View File

Binary file not shown.

2
bin/elasticsearch.in.sh
View File

@ -17,8 +17,6 @@ JAVA_OPTS="$JAVA_OPTS -Xmx${ES_MAX_MEM}"
# reduce the per-thread stack size
JAVA_OPTS="$JAVA_OPTS -Xss128k"
JAVA_OPTS="$JAVA_OPTS -Djline.enabled=true"
# Enable aggressive optimizations in the JVM
# - Disabled by default as it might cause the JVM to crash
# JAVA_OPTS="$JAVA_OPTS -XX:+AggressiveOpts"

5
modules/elasticsearch/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java
View File

@ -142,6 +142,11 @@ public class Bootstrap {
Bootstrap bootstrap = new Bootstrap();
String pidFile = System.getProperty("es-pidfile");
// enable jline by default when running form "main"
if (System.getProperty("jline.enabled") == null) {
System.setProperty("jline.enabled", "true");
}
boolean foreground = System.getProperty("es-foreground") != null;
// handle the wrapper system property, if its a service, don't run as a service
if (System.getProperty("wrapper.service", "XXX").equalsIgnoreCase("true")) {