Sysdeploy/idlers-agent
2
0
Fork 2
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity

refractored code

Browse Source
This commit is contained in:
Shailaja Kumari 2024-07-02 13:42:22 +05:30
parent df525d2908
commit 276f29c707
Signed by: shailaja
GPG Key ID: 2B9455CAFBC4D75A
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
agent.py
View File

@ -406,16 +406,38 @@ class ServerManager:
else: else:
return self.create_note(note_data) 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): def get_os_id(self):
try: try:
response = urllib.request.urlopen(f"{self.host}/api/os") os_list = self.send_request('GET', '/api/os')
os_list = json.loads(response.read().decode()) os_info = self.get_os_release_info()
current_os = os.uname().sysname.lower()
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: for os_entry in os_list:
if current_os in os_entry['name'].lower(): if current_os in os_entry['name'].lower():
return os_entry['id'] 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: except Exception as e:
logging.error("Failed to fetch OS IDs: {}".format(e)) logging.error("Failed to fetch OS IDs: {}".format(e))
return 27 # Default to 'Other' if unable to fetch return 27 # Default to 'Other' if unable to fetch