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

Fix debian init script to not depend on new start-stop-daemon 

By making use of the lsb provided functions, one does not depend on the start-stop daemon version to test if elasticsearch is running.
This ensures, that the init script works on debian wheezy, squeeze, current ubuntu and LTS versions.

Closes #3452
This commit is contained in:
Alexander Reelsen 2013-08-08 11:26:52 +02:00
parent 5c853fb22d
commit a7b643305a
1 changed files with 22 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/deb/init.d/elasticsearch Normal file → Executable file
View File

@ -19,8 +19,6 @@
# Description: Starts elasticsearch using start-stop-daemon
### END INIT INFO
set -e
PATH=/bin:/usr/bin:/sbin:/usr/sbin
NAME=elasticsearch
DESC="ElasticSearch Server"
@ -113,7 +111,6 @@ export ES_JAVA_OPTS
test -x $DAEMON || exit 0
checkJava() {
set +e
if [ -x "$JAVA_HOME/bin/java" ]; then
JAVA="$JAVA_HOME/bin/java"
else
@ -124,7 +121,6 @@ checkJava() {
echo "Could not find any executable java binary. Please install java in your PATH or set JAVA_HOME"
exit 1
fi
set -e
}
case "$1" in
@ -138,9 +134,13 @@ case "$1" in
log_daemon_msg "Starting $DESC"
set +e
start-stop-daemon --status --pidfile "$PID_FILE" >/dev/null
if [ "$?" != "0" ]; then
pid=$( pidofproc -p $PID_FILE elasticsearch)
if [ -n "$pid" ] ; then
log_begin_msg "Already running."
log_end_msg 0
exit 0
fi
# Prepare environment
mkdir -p "$LOG_DIR" "$DATA_DIR" "$WORK_DIR" && chown "$ES_USER":"$ES_GROUP" "$LOG_DIR" "$DATA_DIR" "$WORK_DIR"
touch "$PID_FILE" && chown "$ES_USER":"$ES_GROUP" "$PID_FILE"
@ -155,26 +155,11 @@ case "$1" in
# Start Daemon
start-stop-daemon --start -b --user "$ES_USER" -c "$ES_USER" --pidfile "$PID_FILE" --exec $DAEMON -- $DAEMON_OPTS
sleep 1
start-stop-daemon --status --pidfile "$PID_FILE" >/dev/null
if [ "$?" != "0" ]; then
if [ -f "$PID_FILE" ]; then
rm -f "$PID_FILE"
fi
log_end_msg 1
else
log_end_msg 0
fi
else
log_progress_msg "(already running)"
log_end_msg 0
fi
log_end_msg $?
;;
stop)
log_daemon_msg "Stopping $DESC"
set +e
if [ -f "$PID_FILE" ]; then
start-stop-daemon --stop --pidfile "$PID_FILE" \
--user "$ES_USER" \
@ -191,23 +176,9 @@ case "$1" in
log_progress_msg "(not running)"
fi
log_end_msg 0
set -e
;;
status)
set +e
start-stop-daemon --status --pidfile "$PID_FILE" >/dev/null 2>&1
if [ "$?" != "0" ]; then
if [ -f "$PID_FILE" ]; then
log_success_msg "$DESC is not running, but pid file exists."
exit 1
else
log_success_msg "$DESC is not running."
exit 3
fi
else
log_success_msg "$DESC is running with pid `cat $PID_FILE`"
fi
set -e
status_of_proc -p $PID_FILE elasticsearch elasticsearch && exit 0 || exit $?
;;
restart|force-reload)
if [ -f "$PID_FILE" ]; then