Improve error message on the client

chaen · Sep 28, 2023 · 16654b5 · 16654b5
1 parent 251a05d
commit 16654b5
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/src/DIRAC/FrameworkSystem/Service/ProxyManagerHandler.py b/src/DIRAC/FrameworkSystem/Service/ProxyManagerHandler.py
@@ -428,16 +428,21 @@ def export_exchangeProxyForToken(self):
  group = credDict["group"]
  scopes = [f"vo:{vo}", f"group:{group}"] + [f"property:{prop}" for prop in dirac_properties]
 
- r = requests.get(
- f"{diracxUrl}/auth/legacy-exchange",
- params={
- "preferred_username": credDict["username"],
- "scope": " ".join(scopes),
- },
- headers={"Authorization": f"Bearer {apiKey}"},
- )
+ try:
+ r = requests.get(
+ f"{diracxUrl}/auth/legacy-exchange",
+ params={
+ "preferred_username": credDict["username"],
+ "scope": " ".join(scopes),
+ },
+ headers={"Authorization": f"Bearer {apiKey}"},
+ )
+ except requests.exceptions.RequestException as exc:
+ return S_ERROR(f"Failed to contact DiracX: {exc}")
+ else:
+ if not r.ok:
+ return S_ERROR(f"Failed to contact DiracX: {r.status_code} {r.text}")
 
- r.raise_for_status()
  return S_OK(r.json())