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

fix issues

pull/410/head
vapao 2021-09-18 16:59:12 +08:00
parent cc3dd9ec31
commit 89006a8250
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spug_api/apps/host/utils.py
View File

@ -220,12 +220,14 @@ def fetch_host_extend(ssh):
code, out = ssh.exec_command_raw("dmidecode -t 17 | grep -E 'Size: [0-9]+' | awk '{s+=$2} END {print s,$3}'")
if code == 0:
fields = out.strip().split()
if len(fields) == 2 and fields[1] in ('GB', 'MB'):
size, unit = out.strip().split()
if unit == 'GB':
response['memory'] = size
else:
response['memory'] = round(int(size) / 1024, 0)
else:
if 'memory' not in response:
code, out = ssh.exec_command_raw("free -m | awk 'NR==2{print $2}'")
if code == 0:
response['memory'] = math.ceil(int(out) / 1024)