Merge pull request #6222 from nickryand/background_init

Removed the backgrounding of the unicorn_rails startup scripts

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