Commit 253fe06c authored by Kirill Smelkov's avatar Kirill Smelkov

gitlab: Re-Sync sidekiq service launch with upstream

6a4e45c5 (gitlab: Sync sidekiq service launch with upstream) claimed to
sync sidekiq startup with upstream, but missed one upstream change in
between 8.2 and 8.4:

    https://gitlab.com/gitlab-org/omnibus-gitlab/commit/2eb7634f

My bad - I should have reviewed git log for

    https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/sv-sidekiq-run.erb

and I did not noticed that change because I did not and just compared
queues list visually.

Pick it up.

/cc @kazuhiko, @jerome
/reviewed-by TrustMe (I hope)
parent e9e630ac
...@@ -632,7 +632,7 @@ log = ${sidekiq-dir:log} ...@@ -632,7 +632,7 @@ log = ${sidekiq-dir:log}
# NOTE see queue list here: # NOTE see queue list here:
# https://gitlab.com/gitlab-org/gitlab-ce/blob/master/Procfile # https://gitlab.com/gitlab-org/gitlab-ce/blob/master/Procfile
# https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/sv-sidekiq-run.erb # https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/sv-sidekiq-run.erb
# (last updated for omnibus-gitlab 8.4.2+ce.0-3-g68d5ee8) # (last updated for omnibus-gitlab 8.4.4+ce.0-0-g1680742)
[service-sidekiq] [service-sidekiq]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
wrapper-path = ${directory:service}/sidekiq wrapper-path = ${directory:service}/sidekiq
...@@ -654,7 +654,7 @@ command-line = ...@@ -654,7 +654,7 @@ command-line =
-L ${sidekiq:log}/sidekiq.log -L ${sidekiq:log}/sidekiq.log
-q post_receive -q post_receive
-q mailer -q mailers
-q archive_repo -q archive_repo
-q system_hook -q system_hook
-q project_web_hook -q project_web_hook
......
...@@ -247,7 +247,7 @@ md5sum = cd7aaeeb1917fdedb7656943065c0a9c ...@@ -247,7 +247,7 @@ md5sum = cd7aaeeb1917fdedb7656943065c0a9c
[instance-gitlab.cfg.in] [instance-gitlab.cfg.in]
<= download-file <= download-file
md5sum = 33309e35eb67ea27f7c7a4a5abd459cc md5sum = 5f0b7d51e921e0e37e40fb65552dde9c
[macrolib.cfg.in] [macrolib.cfg.in]
<= download-file <= download-file
......
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