forked from Sysdeploy/idlers-agent
refractored code
This commit is contained in:
parent
df525d2908
commit
276f29c707
30
agent.py
30
agent.py
|
@ -406,16 +406,38 @@ class ServerManager:
|
|||
else:
|
||||
return self.create_note(note_data)
|
||||
|
||||
def get_os_release_info(self):
|
||||
try:
|
||||
with open('/etc/os-release') as f:
|
||||
lines = f.read().splitlines()
|
||||
return {line.split('=')[0]: line.split('=')[1].strip('"') for line in lines if '=' in line}
|
||||
except Exception as e:
|
||||
logging.error("Failed to read /etc/os-release: {}".format(e))
|
||||
return {}
|
||||
|
||||
def get_os_id(self):
|
||||
try:
|
||||
response = urllib.request.urlopen(f"{self.host}/api/os")
|
||||
os_list = json.loads(response.read().decode())
|
||||
current_os = os.uname().sysname.lower()
|
||||
os_list = self.send_request('GET', '/api/os')
|
||||
os_info = self.get_os_release_info()
|
||||
|
||||
if not os_info:
|
||||
logging.error("No OS release info found.")
|
||||
return next(os['id'] for os in os_list if os['name'].lower() == "other" or os['name'].lower() == "custom")
|
||||
|
||||
current_os = f"{os_info.get('NAME', 'Unknown')} {os_info.get('VERSION', '').strip()}".strip().lower()
|
||||
|
||||
for os_entry in os_list:
|
||||
if current_os in os_entry['name'].lower():
|
||||
return os_entry['id']
|
||||
return next(os['id'] for os in os_list if os['name'].lower() == "other")
|
||||
|
||||
if 'ubuntu' in current_os:
|
||||
return next(os['id'] for os in os_list if 'ubuntu' in os['name'].lower())
|
||||
elif 'centos' in current_os:
|
||||
return next(os['id'] for os in os_list if 'centos' in os['name'].lower())
|
||||
elif 'fedora' in current_os:
|
||||
return next(os['id'] for os in os_list if 'fedora' in os['name'].lower())
|
||||
|
||||
return next(os['id'] for os in os_list if os['name'].lower() == "other" or os['name'].lower() == "custom")
|
||||
except Exception as e:
|
||||
logging.error("Failed to fetch OS IDs: {}".format(e))
|
||||
return 27 # Default to 'Other' if unable to fetch
|
||||
|
|
Loading…
Reference in New Issue
Block a user