Merge branch 'init_exit_status' of /home/git/repositories/gitlab/gitlabhq

Dmitriy Zaporozhets
2 parents ff7073ac 4727fa3f
Showing 1 changed file with 8 additions and 0 deletions Show diff stats
lib/support/init.d/gitlab
@@ -102,6 +102,13 @@ check_status(){
   else
     sidekiq_status="-1"
   fi
+  if [ $web_status = 0 -a $sidekiq_status = 0 ]; then
+    gitlab_status=0
+  else
+    # http://refspecs.linuxbase.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/iniscrptact.html
+    # code 3 means 'program is not running'
+    gitlab_status=3
+  fi
 }
  
 ## Check for stale pids and remove them if necessary.
@@ -275,6 +282,7 @@ case &quot;$1&quot; in
         ;;
   status)
         print_status
+        exit $gitlab_status
         ;;
   *)
         echo "Usage: service gitlab {start|stop|restart|reload|status}"
...	...	@@ -102,6 +102,13 @@ check_status(){
102	102	else
103	103	sidekiq_status="-1"
104	104	fi
	105	+ if [ $web_status = 0 -a $sidekiq_status = 0 ]; then
	106	+ gitlab_status=0
	107	+ else
	108	+ # http://refspecs.linuxbase.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/iniscrptact.html
	109	+ # code 3 means 'program is not running'
	110	+ gitlab_status=3
	111	+ fi
105	112	}
106	113
107	114	## Check for stale pids and remove them if necessary.
...	...	@@ -275,6 +282,7 @@ case "$1" in
275	282	;;
276	283	status)
277	284	print_status
	285	+ exit $gitlab_status
278	286	;;
279	287	*)
280	288	echo "Usage: service gitlab {start\|stop\|restart\|reload\|status}"
...	...