Commit bf19ee059f38a9a2ef070e8d00d87e87ac1e58b4
1 parent
e099b0d8
Exists in
master
and in
2 other branches
Guard against spurious unicorn/sidekiq restarts
Showing
1 changed file
with
6 additions
and
4 deletions
Show diff stats
files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb
| @@ -159,8 +159,9 @@ env_vars.each do |key, value| | @@ -159,8 +159,9 @@ env_vars.each do |key, value| | ||
| 159 | group node['gitlab']['user']['group'] | 159 | group node['gitlab']['user']['group'] |
| 160 | mode "0600" | 160 | mode "0600" |
| 161 | content value | 161 | content value |
| 162 | - notifies :restart, "service[unicorn]" | ||
| 163 | - notifies :restart, "service[sidekiq]" | 162 | + dependent_services.each do |svc| |
| 163 | + notifies :restart, svc | ||
| 164 | + end | ||
| 164 | end | 165 | end |
| 165 | end | 166 | end |
| 166 | 167 | ||
| @@ -169,8 +170,9 @@ if File.directory?(gitlab_rails_env_dir) | @@ -169,8 +170,9 @@ if File.directory?(gitlab_rails_env_dir) | ||
| 169 | deleted_env_vars.each do |deleted_var| | 170 | deleted_env_vars.each do |deleted_var| |
| 170 | file deleted_var do | 171 | file deleted_var do |
| 171 | action :delete | 172 | action :delete |
| 172 | - notifies :restart, "service[unicorn]" | ||
| 173 | - notifies :restart, "service[sidekiq]" | 173 | + dependent_services.each do |svc| |
| 174 | + notifies :restart, svc | ||
| 175 | + end | ||
| 174 | end | 176 | end |
| 175 | end | 177 | end |
| 176 | end | 178 | end |