Commit 416f551e authored by Jacob Vosmaer's avatar Jacob Vosmaer

Merge pull request #5879 from krzaczek/smartos-fix

Init script - change stop() function name to stop_gitlab()
parents 78a7a9b0 9422b451
......@@ -149,7 +149,7 @@ exit_if_not_running(){
}
## Starts Unicorn and Sidekiq if they're not running.
start() {
start_gitlab() {
check_stale_pids
if [ "$web_status" != "0" -a "$sidekiq_status" != "0" ]; then
......@@ -184,7 +184,7 @@ start() {
}
## Asks the Unicorn and the Sidekiq if they would be so kind as to stop, if not kills them.
stop() {
stop_gitlab() {
exit_if_not_running
if [ "$web_status" = "0" -a "$sidekiq_status" = "0" ]; then
......@@ -246,7 +246,7 @@ print_status() {
}
## Tells unicorn to reload it's config and Sidekiq to restart
reload(){
reload_gitlab(){
exit_if_not_running
if [ "$wpid" = "0" ];then
echo "The GitLab Unicorn Web server is not running thus its configuration can't be reloaded."
......@@ -263,12 +263,12 @@ reload(){
}
## Restarts Sidekiq and Unicorn.
restart(){
restart_gitlab(){
check_status
if [ "$web_status" = "0" -o "$sidekiq_status" = "0" ]; then
stop
stop_gitlab
fi
start
start_gitlab
}
......@@ -276,16 +276,16 @@ restart(){
case "$1" in
start)
start
start_gitlab
;;
stop)
stop
stop_gitlab
;;
restart)
restart
restart_gitlab
;;
reload|force-reload)
reload
reload_gitlab
;;
status)
print_status
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment