Skip to content
Snippets Groups Projects
Commit 8a6776ca authored by Jacob Vosmaer's avatar Jacob Vosmaer
Browse files

Use 'exec' in Unicorn and Sidekiq launch scripts

When running Unicorn or Sidekiq in the foreground this change removes
an intermediate /bin/sh process. This makes process supervision in the
GitLab Development Kit more reliable.

This change does not affect Omnibus-GitLab (because there we do not
use these launch scripts). Installations from source do use the launch
scripts but for the standard GitLab init script this change will not
make a difference.

Custom installations using Upstart or Systemd may be affected however,
because under certain configurations these systems count exactly how
many forks happen during process startup, and we are reducing that
number by one here.
parent f127edd0
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -37,7 +37,7 @@ start_no_deamonize()
 
start_sidekiq()
{
bundle exec sidekiq -q post_receive -q mailers -q archive_repo -q system_hook -q project_web_hook -q gitlab_shell -q incoming_email -q runner -q common -q default -e $RAILS_ENV -P $sidekiq_pidfile "$@"
exec bundle exec sidekiq -q post_receive -q mailers -q archive_repo -q system_hook -q project_web_hook -q gitlab_shell -q incoming_email -q runner -q common -q default -e $RAILS_ENV -P $sidekiq_pidfile "$@"
}
 
load_ok()
Loading
Loading
Loading
Loading
@@ -19,12 +19,12 @@ get_unicorn_pid()
 
start()
{
$unicorn_cmd -D
exec $unicorn_cmd -D
}
 
start_foreground()
{
$unicorn_cmd
exec $unicorn_cmd
}
 
stop()
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment