stop all services at the same time (closes #348)

elasticsearch-init

@@ -163,7 +163,7 @@ case "$1" in
             start-stop-daemon --stop --pidfile "$PID_FILE" \
                 --user "$ES_USER" \
                 --quiet \
-                --retry forever/TERM/20 > /dev/null
+                --retry TERM/60/KILL/5 > /dev/null
             if [ $? -eq 1 ]; then
                 log_progress_msg "$DESC is not running but pid file exists, cleaning up"
             elif [ $? -eq 3 ]; then

kibana-init

@@ -67,7 +67,7 @@ case "$1" in
 
     if [ -f "$PID_FILE" ]; then
       start-stop-daemon --stop --pidfile "$PID_FILE" \
-        --retry=TERM/20/KILL/5 >/dev/null
+        --retry TERM/60/KILL/5 >/dev/null
       if [ $? -eq 1 ]; then
         log_progress_msg "$DESC is not running but pid file exists, cleaning up"
       elif [ $? -eq 3 ]; then

start.sh

@@ -2,8 +2,6 @@
 #
 # /usr/local/bin/start.sh
 # Start Elasticsearch, Logstash and Kibana services
-#
-# spujadas 2015-10-09; added initial pidfile removal and graceful termination
 
 # WARNING - This script assumes that the ELK services are not running, and is
 #   only expected to be run once, when the container is started.
@@ -15,12 +13,17 @@
 
 _term() {
   echo "Terminating ELK"
-  service elasticsearch stop
-  service logstash stop
-  service kibana stop
-
-  # kill script PGID so all the child processes are killed, to avoid zombies
+
+  # shut down services
+  timeout 60 service elasticsearch stop &
+  timeout 60 service logstash stop &
+  timeout 60 service kibana stop &
   trap - SIGTERM SIGINT
+
+  # wait for all services to stop
+  wait
+
+  # kill script PGID so all the child processes are killed, to avoid zombies
   kill -TERM -- -$$ 2>/dev/null
   exit 0
 }