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

U 优化监控告警描述信息

pull/139/head
vapao 2020-07-01 22:48:20 +08:00
parent f16cbc1f44
commit 731a439222
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spug_api/apps/monitor/executors.py
View File

@ -24,7 +24,7 @@ def port_check(addr, port):
sock = socket() sock = socket()
sock.settimeout(5) sock.settimeout(5)
sock.connect((addr, int(port))) sock.connect((addr, int(port)))
return True, None return True, '端口状态检测正常'
except Exception as e: except Exception as e:
return False, f'异常信息：{e}' return False, f'异常信息：{e}'
@ -33,7 +33,10 @@ def host_executor(host, pkey, command):
try: try:
cli = SSH(host.hostname, host.port, host.username, pkey=pkey) cli = SSH(host.hostname, host.port, host.username, pkey=pkey)
exit_code, out = cli.exec_command(command) exit_code, out = cli.exec_command(command)
return exit_code == 0, out.decode() if exit_code == 0:
return True, out.decode() or '检测状态正常'
else:
return False, out.decode() or f'退出状态码：{exit_code}'
except Exception as e: except Exception as e:
return False, f'异常信息：{e}' return False, f'异常信息：{e}'