Guard against spurious unicorn/sidekiq restarts

Jacob Vosmaer
1 parent e099b0d8
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|
     group node['gitlab']['user']['group']
     mode "0600"
     content value
-    notifies :restart, "service[unicorn]"
-    notifies :restart, "service[sidekiq]"
+    dependent_services.each do |svc|
+      notifies :restart, svc
+    end
   end
 end
  
@@ -169,8 +170,9 @@ if File.directory?(gitlab_rails_env_dir)
   deleted_env_vars.each do |deleted_var|
     file deleted_var do
       action :delete
-      notifies :restart, "service[unicorn]"
-      notifies :restart, "service[sidekiq]"
+      dependent_services.each do |svc|
+        notifies :restart, svc
+      end
     end
   end
 end
...	...	@@ -159,8 +159,9 @@ env_vars.each do \|key, value\|
159	159	group node['gitlab']['user']['group']
160	160	mode "0600"
161	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	165	end
165	166	end
166	167
...	...	@@ -169,8 +170,9 @@ if File.directory?(gitlab_rails_env_dir)
169	170	deleted_env_vars.each do \|deleted_var\|
170	171	file deleted_var do
171	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	176	end
175	177	end
176	178	end
...	...