diff options
| author | Caleb Maclennan | 2016-04-09 07:15:40 +0000 |
|---|---|---|
| committer | Caleb Maclennan | 2016-04-09 07:47:04 +0000 |
| commit | 28e3a5d0dae4783de778b89af13528355f16b4b8 (patch) | |
| tree | 5cdcbea6a5cde5ab1f3b0c9fa1a3e2bb4775f4ba /gitlab-sidekiq.service | |
| parent | 0f6ff0dd25f96ff36eb5d24bdee03ff2a662023d (diff) | |
| download | aur-28e3a5d0dae4783de778b89af13528355f16b4b8.tar.gz | |
Normalize PID location for Sidekiq where Gitlab's is and drop bogus log redirection
The log redirection trips up systemd as it can't actually show anything
useful about the state of the process in the system journal or with
`systemctl status`. We're already logging the process messages from the
main Gitlab service the normal systemd way, so let it happen for Sidekiq
too.
Diffstat (limited to 'gitlab-sidekiq.service')
| -rw-r--r-- | gitlab-sidekiq.service | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gitlab-sidekiq.service b/gitlab-sidekiq.service index a788a9900b1a..e5d2e3dec920 100644 --- a/gitlab-sidekiq.service +++ b/gitlab-sidekiq.service @@ -11,7 +11,7 @@ Group=gitlab WorkingDirectory=<DATADIR> Environment=RAILS_ENV=production PATH=/opt/ruby2.1/bin:/usr/bin SyslogIdentifier=gitlab-sidekiq -PIDFile=<HOMEDIR>/pids/sidekiq.pid +PIDFile=/run/gitlab/sidekiq.pid CapabilityBoundingSet= PrivateTmp=true @@ -23,8 +23,8 @@ ProtectHome=true # instead you can safely enable this security feature. #NoNewPrivileges=true -ExecStart=/usr/bin/bundle-2.1 exec "sidekiq -q post_receive -q mailers -q system_hook -q incoming_email -q project_web_hook -q gitlab_shell -q common -q default -q archive_repo -e production -L <LOGDIR>/sidekiq.log >> <LOGDIR>/sidekiq.log 2>&1" -ExecStop=/usr/bin/bundle-2.1 exec "sidekiqctl stop <HOMEDIR>/pids/sidekiq.pid >> <LOGDIR>/sidekiq.log 2>&1" +ExecStart=/usr/bin/bundle-2.1 exec sidekiq -q post_receive -q mailers -q system_hook -q incoming_email -q project_web_hook -q gitlab_shell -q common -q default -q archive_repo -e production +ExecStop=/usr/bin/bundle-2.1 exec sidekiqctl stop /run/gitlab/sidekiq.pid [Install] WantedBy=multi-user.target |