External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-19 23:07:42 -02:30
Code Issues Packages Projects Releases Wiki Activity

improve error handling

Browse Source
This commit is contained in:
Peter Braun
2025-04-23 11:09:50 +02:00
parent 73187c61f4
commit 1417b1e33e
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
awx/main/utils/licensing.py
View File

@@ -243,10 +243,7 @@ class Licenser(object):
def get_rhsm_subs(self, host, user, pw): def get_rhsm_subs(self, host, user, pw):
json = [] json = []
try: subs = requests.get('/'.join([host, 'subscription/users/{}/owners'.format(user)]), verify=True, auth=(user, pw))
subs = requests.get('/'.join([host, 'subscription/users/{}/owners'.format(user)]), verify=True, auth=(user, pw))
except requests.exceptions.ConnectionError as error:
raise error
subs.raise_for_status() subs.raise_for_status()
for sub in subs.json(): for sub in subs.json():
@@ -261,14 +258,19 @@ class Licenser(object):
verify = str(self.config.get("rhsm", "repo_ca_cert")) verify = str(self.config.get("rhsm", "repo_ca_cert"))
port = str(self.config.get("server", "port")) port = str(self.config.get("server", "port"))
except Exception as e: except Exception as e:
verify = True
logger.exception('Unable to read rhsm config to get ca_cert location. {}'.format(str(e))) logger.exception('Unable to read rhsm config to get ca_cert location. {}'.format(str(e)))
if port: if port:
host = ':'.join([host, port]) host = ':'.join([host, port])
json = [] json = []
try: try:
orgs = requests.get('/'.join([host, 'katello/api/organizations']), verify=True, auth=(user, pw)) orgs = requests.get('/'.join([host, 'katello/api/organizations']), verify=verify, auth=(user, pw))
except requests.exceptions.ConnectionError as error: except requests.exceptions.ConnectionError as error:
raise error raise error
except OSError as error:
raise OSError(
'Unable to open certificate bundle {}. Check that the service is running on Red Hat Enterprise Linux.'.format(verify)
) from error # noqa
orgs.raise_for_status() orgs.raise_for_status()
for org in orgs.json()['results']: for org in orgs.json()['results']: