Skip to content

Commit 8988381

Browse files
committed
Reload nginx config for proxied services only after those services are RUNNING
1 parent 10530e8 commit 8988381

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

cm/services/apps/nginx.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,7 @@ def reconfigure(self, setup_ssl):
147147
if "1.4" in misc.getoutput("{0} -v".format(self.exe)):
148148
nginx_tmplt = conf_manager.NGINX_14_CONF_TEMPLATE
149149
params = {'galaxy_user_name': paths.GALAXY_USER_NAME,
150-
'nginx_conf_dir': self.conf_dir,
151-
}
150+
'nginx_conf_dir': self.conf_dir}
152151
if setup_ssl:
153152
log.debug("Using Nginx v1.4+ template w/ SSL")
154153
# Generate a self-signed certificate
@@ -249,9 +248,9 @@ def status(self):
249248
"""
250249
# Check if nginx config needs to be reconfigured
251250
aa = self.app.manager.service_registry.all_active(names=True)
252-
for s in self.app.manager.service_registry.all_active(names=True):
253-
if s not in self.proxied_services:
254-
aa.remove(s)
251+
for s in self.app.manager.service_registry.all_active():
252+
if s.name not in self.proxied_services or not s.running():
253+
aa.remove(s.name)
255254
if set(self.active_proxied) != set(aa):
256255
# There was a service change, run reconfigure
257256
self.active_proxied = aa

0 commit comments

Comments
 (0)