NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-15 23:45:44 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[FIX] runbot: nginx reload

Browse Source 
Actually check the return code and do not raise any exception doing so.
This commit is contained in:
Julien Legros 2018-03-21 13:02:15 +01:00
parent dc3659c6f1
commit f8cbae79e1
No known key found for this signature in database
GPG Key ID: 05AABD5397BF114D
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runbot/models/repo.py
View File

@ -294,9 +294,9 @@ class runbot_repo(models.Model):
os.kill(pid, signal.SIGHUP)
except Exception:
_logger.debug('start nginx')
if subprocess.check_output(['/usr/sbin/nginx', '-p', nginx_dir, '-c', 'nginx.conf']):
if subprocess.call(['/usr/sbin/nginx', '-p', nginx_dir, '-c', 'nginx.conf']):
# obscure nginx bug leaving orphan worker listening on nginx port
if not subprocess.check_output(['pkill', '-f', '-P1', 'nginx: worker']):
if not subprocess.call(['pkill', '-f', '-P1', 'nginx: worker']):
_logger.debug('failed to start nginx - orphan worker killed, retrying')
subprocess.call(['/usr/sbin/nginx', '-p', nginx_dir, '-c', 'nginx.conf'])
else: