diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-04-28 12:11:08 +0200 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-04-28 12:11:08 +0200 |
| commit | 8a6776caa9f45c4c16347ad662bd83519032687d (patch) | |
| tree | e8317c1fa94ed9047a9acc531b1004f0b75d6290 /bin/background_jobs | |
| parent | f127edd012bd8b6f76ac67d69aadbd7d4837258f (diff) | |
| download | gitlab-ce-8a6776caa9f45c4c16347ad662bd83519032687d.tar.gz | |
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.
Diffstat (limited to 'bin/background_jobs')
| -rwxr-xr-x | bin/background_jobs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/background_jobs b/bin/background_jobs index 1f67d732949..25a578a1c49 100755 --- a/bin/background_jobs +++ b/bin/background_jobs @@ -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() |