|
@@ -126,16 +126,14 @@ launch_service()
|
|
|
es_parms="$es_parms -Des.foreground=yes"
|
|
|
exec "$JAVA" $JAVA_OPTS $ES_JAVA_OPTS $es_parms -Des.path.home="$ES_HOME" -cp "$ES_CLASSPATH" $props \
|
|
|
org.elasticsearch.bootstrap.ElasticSearch
|
|
|
- execval=$?
|
|
|
+ # exec without running it in the background, makes it replace this shell, we'll never get here...
|
|
|
+ # no need to return something
|
|
|
else
|
|
|
# Startup ElasticSearch, background it, and write the pid.
|
|
|
exec "$JAVA" $JAVA_OPTS $ES_JAVA_OPTS $es_parms -Des.path.home="$ES_HOME" -cp "$ES_CLASSPATH" $props \
|
|
|
org.elasticsearch.bootstrap.ElasticSearch <&- &
|
|
|
- execval=$?
|
|
|
- [ ! -z "$pidpath" ] && printf '%d' $! > "$pidpath"
|
|
|
+ return $?
|
|
|
fi
|
|
|
-
|
|
|
- return $execval
|
|
|
}
|
|
|
|
|
|
# Parse any command line options.
|