Merge pull request #102 from Bisa/issue/#100-stopping-systemd-started-causes-timeout

Issue/#100 stopping systemd started causes timeout

Author: Bisa

factorio

@@ -197,11 +197,11 @@ start_service() {
 stop_service() {
   if [ -e ${PIDFILE} ]; then
     echo -n "Stopping ${SERVICE_NAME}: "
-    if kill -TERM $(cat ${PIDFILE}) 2> /dev/null; then
+    if kill -TERM $(cat ${PIDFILE} 2> /dev/null) 2> /dev/null; then
       sec=1
       while [ "$sec" -le 15 ]; do
         if [ -e ${PIDFILE} ]; then
-          if kill -0 $(cat ${PIDFILE}) 2> /dev/null; then
+          if kill -0 $(cat ${PIDFILE} 2> /dev/null) 2> /dev/null; then
             echo -n ". "
             sleep 1
           else
@@ -214,15 +214,22 @@ stop_service() {
       done
     fi
 
-    if kill -0 $(cat ${PIDFILE}) 2> /dev/null; then
+    if kill -0 $(cat ${PIDFILE} 2> /dev/null) 2> /dev/null; then
       echo "Unable to shut down nicely, killing the process!"
-      kill -KILL $(cat ${PIDFILE}) 2> /dev/null
+      kill -KILL $(cat ${PIDFILE} 2> /dev/null) 2> /dev/null
     else
       echo "complete!"
     fi
 
+    # Start the reader (in case tail stopped already)
+    cat ${FIFO} &
+    # Open pipe for writing.
+    exec 3> ${FIFO}
     # Write a newline to the pipe, this triggers a SIGPIPE and causes tail to exit
-    echo "" > ${FIFO}
+    echo "" >&3
+    # Close pipe.
+    exec 3>&-
+
     rm ${PIDFILE} 2> /dev/null
     return 0 # we've either shut down gracefully or killed the process
   else