mirror of https://github.com/openspug/spug
A 发布结果通知添加主机信息
parent
1951b45814
commit
8e15ea847f
|
@ -193,6 +193,7 @@ class Helper:
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def send_deploy_notify(req):
|
def send_deploy_notify(req):
|
||||||
rst_notify = json.loads(req.deploy.rst_notify)
|
rst_notify = json.loads(req.deploy.rst_notify)
|
||||||
|
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)
|
extra = json.loads(req.extra)
|
||||||
if req.deploy.extend == '1':
|
if req.deploy.extend == '1':
|
||||||
|
@ -203,13 +204,15 @@ class Helper:
|
||||||
version = extra1
|
version = extra1
|
||||||
else:
|
else:
|
||||||
version = extra[0]
|
version = extra[0]
|
||||||
|
hosts = [{'id': x.id, 'name': x.name} for x in Host.objects.filter(id__in=host_ids)]
|
||||||
if rst_notify['mode'] == '1':
|
if rst_notify['mode'] == '1':
|
||||||
color, text = ('#8ece60', '成功') if req.status == '3' else ('#f90202', '失败')
|
color, text = ('#8ece60', '成功') if req.status == '3' else ('#f90202', '失败')
|
||||||
texts = [
|
texts = [
|
||||||
'## %s ## ' % '发布结果通知',
|
'## %s ## ' % '发布结果通知',
|
||||||
f'**应用名称:** {req.deploy.app.name} ',
|
f'**应用名称:** {req.deploy.app.name} ',
|
||||||
f'**发布环境:** {req.deploy.env.name} ',
|
|
||||||
f'**应用版本:** {version} ',
|
f'**应用版本:** {version} ',
|
||||||
|
f'**发布环境:** {req.deploy.env.name} ',
|
||||||
|
f'**发布主机:** {",".join(x["name"] for x in hosts)} ',
|
||||||
f'**发布结果:** <font color="{color}">{text}</font>',
|
f'**发布结果:** <font color="{color}">{text}</font>',
|
||||||
f'**发布时间:** {human_datetime()} ',
|
f'**发布时间:** {human_datetime()} ',
|
||||||
'> 来自 Spug运维平台'
|
'> 来自 Spug运维平台'
|
||||||
|
@ -230,6 +233,7 @@ class Helper:
|
||||||
'env_id': req.deploy.env_id,
|
'env_id': req.deploy.env_id,
|
||||||
'env_name': req.deploy.env.name,
|
'env_name': req.deploy.env.name,
|
||||||
'version': version,
|
'version': version,
|
||||||
|
'targets': hosts,
|
||||||
'is_success': req.status == '3',
|
'is_success': req.status == '3',
|
||||||
'deploy_at': human_datetime()
|
'deploy_at': human_datetime()
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue