Commit 7d6a17dd authored by Bob Van Landuyt's avatar Bob Van Landuyt

Merge branch 'fix-sysvinit-sidekiq-logging' into 'master'

Fix sysvinit Sidekiq logging

See merge request gitlab-org/gitlab!73850
parents b83ebdd4 6f7e676a
......@@ -291,7 +291,9 @@ start_gitlab() {
if [ "$sidekiq_status" = "0" ]; then
echo "The Sidekiq job dispatcher is already running with pid $spid, not restarting"
else
RAILS_ENV=$RAILS_ENV SIDEKIQ_WORKERS=$SIDEKIQ_WORKERS bin/background_jobs start &
# bin/background_jobs writes to log/sidekiq.log and stdout by
# default, so we just need to suppress the latter here.
RAILS_ENV=$RAILS_ENV SIDEKIQ_WORKERS=$SIDEKIQ_WORKERS bin/background_jobs start > /dev/null &
fi
if [ "$gitlab_workhorse_status" = "0" ]; then
......@@ -454,7 +456,9 @@ reload_gitlab(){
echo "Done."
echo "Restarting GitLab Sidekiq since it isn't capable of reloading its config..."
RAILS_ENV=$RAILS_ENV SIDEKIQ_WORKERS=$SIDEKIQ_WORKERS bin/background_jobs restart
# bin/background_jobs writes to log/sidekiq.log and stdout by default,
# so we just need to suppress the latter here.
RAILS_ENV=$RAILS_ENV SIDEKIQ_WORKERS=$SIDEKIQ_WORKERS bin/background_jobs restart > /dev/null &
if [ "$mail_room_enabled" != true ]; then
echo "Restarting GitLab MailRoom since it isn't capable of reloading its config..."
......
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