Skip to content

fix: use WebAppClient instead of JobMonitoringClient #787

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fstagni merged 1 commit into from
Jul 15, 2025
+16 −16
Merged

fix: use WebAppClient instead of JobMonitoringClient #787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions src/WebAppDIRAC/WebApp/handler/JobMonitorHandler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ def web_getSelectionData(self):
callback = JobMonitorHandler.__dataCache.get(cacheKey)
if not callback:
callback = {}
result = JobMonitoringClient().getJobGroups()
result = WebAppClient().getJobGroups()
if result["OK"]:
prod = []
prods = result["Value"]
Expand All @@ -109,11 +109,11 @@ def web_getSelectionData(self):
else:
prod = [["Nothing to display"]]
else:
gLogger.error(f"JobMonitoringClient().getJobGroups() return error: {result['Message']}")
gLogger.error(f"WebAppClient().getJobGroups() return error: {result['Message']}")
prod = [["Error happened on service side"]]
callback["prod"] = prod

result = JobMonitoringClient().getSites()
result = WebAppClient().getSites()
if result["OK"]:
tier1 = gConfig.getValue("/WebApp/PreferredSites", []) # Always return a list
site = []
Expand All @@ -127,11 +127,11 @@ def web_getSelectionData(self):
else:
site = [["Nothing to display"]]
else:
gLogger.error(f"JobMonitoringClient().getSites() return error: {result['Message']}")
gLogger.error(f"WebAppClient().getSites() return error: {result['Message']}")
site = [["Error happened on service side"]]
callback["site"] = site
# ##
result = JobMonitoringClient().getStates()
result = WebAppClient().getStates()
if result["OK"]:
stat = []
if result["Value"]:
Expand All @@ -140,11 +140,11 @@ def web_getSelectionData(self):
else:
stat = [["Nothing to display"]]
else:
gLogger.error(f"JobMonitoringClient().getStates() return error: {result['Message']}")
gLogger.error(f"WebAppClient().getStates() return error: {result['Message']}")
stat = [["Error happened on service side"]]
callback["status"] = stat
# ##
result = JobMonitoringClient().getMinorStates()
result = WebAppClient().getMinorStates()
if result["OK"]:
stat = []
if result["Value"]:
Expand All @@ -153,11 +153,11 @@ def web_getSelectionData(self):
else:
stat = [["Nothing to display"]]
else:
gLogger.error(f"JobMonitoringClient().getMinorStates() return error: {result['Message']}")
gLogger.error(f"WebAppClient().getMinorStates() return error: {result['Message']}")
stat = [["Error happened on service side"]]
callback["minorstat"] = stat
# ##
result = JobMonitoringClient().getApplicationStates()
result = WebAppClient().getApplicationStates()
if result["OK"]:
app = []
if result["Value"]:
Expand All @@ -166,11 +166,11 @@ def web_getSelectionData(self):
else:
app = [["Nothing to display"]]
else:
gLogger.error(f"JobMonitoringClient().getApplicationstates() return error: {result['Message']}")
gLogger.error(f"WebAppClient().getApplicationstates() return error: {result['Message']}")
app = [["Error happened on service side"]]
callback["app"] = app
# ##
result = JobMonitoringClient().getJobTypes()
result = WebAppClient().getJobTypes()
if result["OK"]:
types = []
if result["Value"]:
Expand All @@ -179,15 +179,15 @@ def web_getSelectionData(self):
else:
types = [["Nothing to display"]]
else:
gLogger.error(f"JobMonitoringClient().getJobTypes() return error: {result['Message']}")
gLogger.error(f"WebAppClient().getJobTypes() return error: {result['Message']}")
types = [["Error happened on service side"]]
callback["types"] = types
# ##
# groupProperty = credentials.getProperties(group)
if not self.isRegisteredUser():
callback["owner"] = [["Insufficient rights"]]
else:
result = JobMonitoringClient().getOwners()
result = WebAppClient().getOwners()
if result["OK"]:
owner = []
if result["Value"]:
Expand All @@ -199,11 +199,11 @@ def web_getSelectionData(self):
owner = [[user]]
callback["owner"] = owner
else:
gLogger.error(f"JobMonitoringClient().getOwners() return error: {result['Message']}")
gLogger.error(f"WebAppClient().getOwners() return error: {result['Message']}")
owner = [["Error happened on service side"]]
callback["owner"] = owner

result = JobMonitoringClient().getOwnerGroup()
result = WebAppClient().getOwnerGroup()
if result["OK"]:
callback["OwnerGroup"] = [[group] for group in result["Value"]]

Expand Down
2 changes: 1 addition & 1 deletion src/WebAppDIRAC/WebApp/handler/PilotSummaryHandler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def web_getSelectionData(self):
if self.getUserName() == "Anonymous":
return {"success": "false", "result": [], "total": 0, "error": "Insufficient rights"}

if (result := JobMonitoringClient().getSites())["OK"]:
if (result := WebAppClient().getSites())["OK"]:
tier1 = gConfig.getValue("/WebApp/PreferredSites", [])
site = []
if len(result["Value"]) > 0:
Expand Down