forked from Sysdeploy/idlers-agent
Compare commits
No commits in common. "0e996333b2e14aea2eac22278473f0277cfe02a0" and "de3d5fb4abb42bd64a3f3751ef6a33b8acbe80aa" have entirely different histories.
0e996333b2
...
de3d5fb4ab
18
agent.py
18
agent.py
|
@ -13,6 +13,7 @@ NON_UPDATABLE_KEYS = [
|
||||||
'bandwidth',
|
'bandwidth',
|
||||||
'was_promo',
|
'was_promo',
|
||||||
'active',
|
'active',
|
||||||
|
'show_public',
|
||||||
'owned_since',
|
'owned_since',
|
||||||
'currency',
|
'currency',
|
||||||
'price',
|
'price',
|
||||||
|
@ -38,20 +39,9 @@ class ServerData:
|
||||||
return ram, disk
|
return ram, disk
|
||||||
|
|
||||||
def get_cpu_count(self):
|
def get_cpu_count(self):
|
||||||
cpu_count = 0
|
with open('/proc/cpuinfo', 'r') as f:
|
||||||
if os.path.isfile('/usr/sbin/dmidecode'):
|
cpuinfo = f.read()
|
||||||
try:
|
cpu_count = cpuinfo.count('processor')
|
||||||
output = subprocess.check_output(['sudo', '/usr/sbin/dmidecode', '-t', 'processor']).decode('utf-8')
|
|
||||||
core_match = re.search(r'Core Count: (\d+)', output)
|
|
||||||
thread_match = re.search(r'Thread Count: (\d+)', output)
|
|
||||||
if core_match and thread_match:
|
|
||||||
cpu_count = int(core_match.group(1)) * int(thread_match.group(1))
|
|
||||||
except subprocess.CalledProcessError:
|
|
||||||
pass
|
|
||||||
if cpu_count == 0:
|
|
||||||
with open('/proc/cpuinfo', 'r') as f:
|
|
||||||
cpuinfo = f.read()
|
|
||||||
cpu_count = cpuinfo.count('processor')
|
|
||||||
logging.info(f"CPU Count: {cpu_count}")
|
logging.info(f"CPU Count: {cpu_count}")
|
||||||
return cpu_count
|
return cpu_count
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user