github
/
spug
mirror of https://github.com/openspug/spug
1
0
Fork 0
Code Issues Releases Wiki Activity

fix issue with send depoy notification

pull/342/head
vapao 2021-06-18 15:31:20 +08:00
parent fad0292326
commit 78928841d3
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spug_api/apps/deploy/utils.py
View File

@ -327,15 +327,7 @@ class Helper:
rst_notify = json.loads(req.deploy.rst_notify) rst_notify = json.loads(req.deploy.rst_notify)
host_ids = json.loads(req.host_ids) host_ids = json.loads(req.host_ids)
if rst_notify['mode'] != '0' and rst_notify.get('value'): if rst_notify['mode'] != '0' and rst_notify.get('value'):
extra = json.loads(req.extra) version = req.version
if req.deploy.extend == '1':
mode, extra1, extra2 = extra
if mode == 'branch':
version = f'{extra1}#{extra2[:6]}'
else:
version = extra1
else:
version = extra[0] or ''
hosts = [{'id': x.id, 'name': x.name} for x in Host.objects.filter(id__in=host_ids)] hosts = [{'id': x.id, 'name': x.name} for x in Host.objects.filter(id__in=host_ids)]
host_str = ', '.join(x['name'] for x in hosts[:2]) host_str = ', '.join(x['name'] for x in hosts[:2])
if len(hosts) > 2: if len(hosts) > 2: