diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-02 00:06:26 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-02 00:06:26 +0000 |
| commit | 587794b4b8a6e919e77ee4abe8215fa291e6a91d (patch) | |
| tree | 380d6578d1ab5902bb521071128bafd4f70472ef /bin | |
| parent | e0bd3a45d9dc6c74cac1a33ea8c03d6d8334249b (diff) | |
| download | gitlab-ce-587794b4b8a6e919e77ee4abe8215fa291e6a91d.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/background_jobs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/background_jobs b/bin/background_jobs index 9d12422b81a..06f26df5409 100755 --- a/bin/background_jobs +++ b/bin/background_jobs @@ -28,7 +28,7 @@ restart() stop fi killall - start_sidekiq -d -L $sidekiq_logfile >> $sidekiq_logfile 2>&1 + start_sidekiq -P $sidekiq_pidfile -d -L $sidekiq_logfile >> $sidekiq_logfile 2>&1 } start_no_deamonize() @@ -45,7 +45,7 @@ start_sidekiq() cmd="${cmd} ${chpst} -P" fi - ${cmd} bundle exec sidekiq -C "${sidekiq_config}" -e $RAILS_ENV -P $sidekiq_pidfile "$@" + ${cmd} bundle exec sidekiq -C "${sidekiq_config}" -e $RAILS_ENV "$@" } load_ok() |