Commit b403d40f authored by Douwe Maan's avatar Douwe Maan

Merge branch 'exec-in-launch-wrappers' into 'master'

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.

Closes https://gitlab.com/gitlab-org/gitlab-development-kit/issues/116

See merge request !3964
parents 1a9d5059 8a6776ca
No related merge requests found
...@@ -37,7 +37,7 @@ start_no_deamonize() ...@@ -37,7 +37,7 @@ start_no_deamonize()
start_sidekiq() 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() load_ok()
......
...@@ -19,12 +19,12 @@ get_unicorn_pid() ...@@ -19,12 +19,12 @@ get_unicorn_pid()
start() start()
{ {
$unicorn_cmd -D exec $unicorn_cmd -D
} }
start_foreground() start_foreground()
{ {
$unicorn_cmd exec $unicorn_cmd
} }
stop() stop()
......
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