Dont write pidfile twice on startup

There is no need to write the pidfile in the bin/elasticsearchshell script as this happens already in the java code. Also cleaning up the bin/elasticsearch shell script a bit (no need to return an error code when exec is called, as this forks and exits the shell script immediately). Closes elastic#3529 Closes elastic#1745
lmenezes · Aug 23, 2013 · 2b03bc8 · 2b03bc8
1 parent 1ac00a1
commit 2b03bc8
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/bin/elasticsearch b/bin/elasticsearch
@@ -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.