diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 17:22:11 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 17:22:11 +0300 |
| commit | 0c872e02b2c822e3397515ec324051ff540f0cd5 (patch) | |
| tree | ce2fb6ce7030e4dad0f4118d21ab6453e5938cdd /lib/support | |
| parent | f7e05a6853b12f02911494c4b3fe53d9540d74fc (diff) | |
Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42
Diffstat (limited to 'lib/support')
| -rwxr-xr-x | lib/support/init.d/gitlab | 6 | ||||
| -rw-r--r-- | lib/support/systemd/gitlab-sidekiq.service | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/lib/support/init.d/gitlab b/lib/support/init.d/gitlab index 1ad89fdc364..092c7d32ffb 100755 --- a/lib/support/init.d/gitlab +++ b/lib/support/init.d/gitlab @@ -65,11 +65,7 @@ if ! cd "$app_root" ; then echo "Failed to cd into $app_root, exiting!"; exit 1 fi -if [ -z "$SIDEKIQ_WORKERS" ]; then - sidekiq_pid_path="$pid_path/sidekiq.pid" -else - sidekiq_pid_path="$pid_path/sidekiq-cluster.pid" -fi +sidekiq_pid_path="$pid_path/sidekiq-cluster.pid" ### Init Script functions diff --git a/lib/support/systemd/gitlab-sidekiq.service b/lib/support/systemd/gitlab-sidekiq.service index cab741010ed..d8585a59085 100644 --- a/lib/support/systemd/gitlab-sidekiq.service +++ b/lib/support/systemd/gitlab-sidekiq.service @@ -10,13 +10,14 @@ Type=notify User=git WorkingDirectory=/home/git/gitlab Environment=RAILS_ENV=production -ExecStart=/usr/local/bin/bundle exec sidekiq --config /home/git/gitlab/config/sidekiq_queues.yml --environment production +Environment=SIDEKIQ_QUEUES=* +ExecStart=/home/git/gitlab/bin/sidekiq-cluster $SIDEKIQ_QUEUES -P /home/git/gitlab/tmp/pids/sidekiq.pid +NotifyAccess=all PIDFile=/home/git/gitlab/tmp/pids/sidekiq.pid Restart=on-failure RestartSec=1 SyslogIdentifier=gitlab-sidekiq Slice=gitlab.slice -WatchdogSec=10 [Install] WantedBy=gitlab.target |