Commit ad7cd8fb35869abc884a415fd16057d522a2fd8e
Exists in
spb-stable
and in
3 other branches
Merge pull request #6222 from nickryand/background_init
Removed the backgrounding of the unicorn_rails startup scripts
Showing
1 changed file
with
1 additions
and
1 deletions
Show diff stats
lib/support/init.d/gitlab
| @@ -167,7 +167,7 @@ start_gitlab() { | @@ -167,7 +167,7 @@ start_gitlab() { | ||
| 167 | # Remove old socket if it exists | 167 | # Remove old socket if it exists |
| 168 | rm -f "$socket_path"/gitlab.socket 2>/dev/null | 168 | rm -f "$socket_path"/gitlab.socket 2>/dev/null |
| 169 | # Start the web server | 169 | # Start the web server |
| 170 | - RAILS_ENV=$RAILS_ENV script/web start & | 170 | + RAILS_ENV=$RAILS_ENV script/web start |
| 171 | fi | 171 | fi |
| 172 | 172 | ||
| 173 | # If sidekiq is already running, don't start it again. | 173 | # If sidekiq is already running, don't start it again. |