github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-03 16:35:10 +00:00
Code Issues Projects Releases Wiki Activity

[Bugfix] 修复bsd获取cpu数量bug

Browse Source
This commit is contained in:
ibuler
2018-01-26 16:28:40 +08:00
parent c553872f90
commit 723805d395
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/assets/tasks.py
View File

@@ -56,7 +56,7 @@ def set_assets_hardware_info(result, **kwargs):
else: else:
___cpu_model = 'Unknown' ___cpu_model = 'Unknown'
___cpu_count = info['ansible_processor_count'] ___cpu_count = info['ansible_processor_count']
___cpu_cores = info.get('ansible_processor_cores', '') ___cpu_cores = info.get('ansible_processor_cores', None) or len(info.get('ansible_processor', []))
___memory = '%s %s' % capacity_convert('{} MB'.format(info['ansible_memtotal_mb'])) ___memory = '%s %s' % capacity_convert('{} MB'.format(info['ansible_memtotal_mb']))
disk_info = {} disk_info = {}
for dev, dev_info in info['ansible_devices'].items(): for dev, dev_info in info['ansible_devices'].items():