From 183b4cb633c268a9504951d3a2c976162070ea1f Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Tue, 19 Jul 2016 11:30:43 +0200
Subject: new files from jenkins 2.7.1

---
 hosts/jenkins/etc/init.d/jenkins | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

(limited to 'hosts/jenkins/etc/init.d')

diff --git a/hosts/jenkins/etc/init.d/jenkins b/hosts/jenkins/etc/init.d/jenkins
index ccb33d5d..2714eb13 100755
--- a/hosts/jenkins/etc/init.d/jenkins
+++ b/hosts/jenkins/etc/init.d/jenkins
@@ -180,13 +180,27 @@ do_stop()
     return 0
 }
 
+# Verify the process did in fact start successfully and didn't just bomb out
+do_check_started_ok() {
+    sleep 1
+    if [ "$1" -ne "0" ]; then return $1; fi
+    get_running
+    if [ "$?" -eq "0" ]; then
+        return 2
+    else 
+        return 0
+    fi
+}
+
 case "$1" in
   start)
     log_daemon_msg "Starting $DESC" "$NAME"
     do_start
+    START_STATUS="$?"
+    do_check_started_ok "$START_STATUS"
     case "$?" in
         0|1) log_end_msg 0 ;;
-        2) log_end_msg 1 ;;
+        2) log_end_msg 1 ; exit 7 ;;
     esac
     ;;
   stop)
@@ -194,7 +208,7 @@ case "$1" in
     do_stop
     case "$?" in
         0|1) log_end_msg 0 ;;
-        2) log_end_msg 1 ;;
+        2) log_end_msg 1 ; exit 100 ;;
     esac
     ;;
   restart|force-reload)
@@ -207,10 +221,13 @@ case "$1" in
     case "$?" in
       0|1)
         do_start
+        START_STATUS="$?"
+        sleep 1
+        do_check_started_ok "$START_STATUS"
         case "$?" in
           0) log_end_msg 0 ;;
-          1) log_end_msg 1 ;; # Old process is still running
-          *) log_end_msg 1 ;; # Failed to start
+          1) log_end_msg 1 ; exit 100 ;; # Old process is still running
+          *) log_end_msg 1 ; exit 100 ;; # Failed to start
         esac
         ;;
       *)
-- 
cgit v1.2.3-54-g00ecf