summaryrefslogtreecommitdiffstats
path: root/hosts/jenkins/etc/init.d
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2016-07-19 11:30:43 +0200
committerHolger Levsen <holger@layer-acht.org>2016-07-19 11:30:43 +0200
commit183b4cb633c268a9504951d3a2c976162070ea1f (patch)
tree4ae5cb8e799d629875deb498b8db533daf6799da /hosts/jenkins/etc/init.d
parent7aba905d1f15e1eaf56a9243309a69007d0dcbd2 (diff)
downloadjenkins.debian.net-183b4cb633c268a9504951d3a2c976162070ea1f.tar.xz
new files from jenkins 2.7.1
Diffstat (limited to 'hosts/jenkins/etc/init.d')
-rwxr-xr-xhosts/jenkins/etc/init.d/jenkins25
1 files changed, 21 insertions, 4 deletions
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
;;
*)