Skip to content

Reintroduce WMSAdministratorClient #785

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
Jun 2, 2025
Merged

Reintroduce WMSAdministratorClient #785

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
6 changes: 4 additions & 2 deletions src/WebAppDIRAC/WebApp/handler/JobMonitorHandler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
from DIRAC.WorkloadManagementSystem.Client.JobMonitoringClient import JobMonitoringClient
from DIRAC.WorkloadManagementSystem.Client.JobManagerClient import JobManagerClient
from DIRAC.WorkloadManagementSystem.Client.PilotManagerClient import PilotManagerClient
from DIRAC.WorkloadManagementSystem.Client.WMSAdministratorClient import WMSAdministratorClient

from DIRAC.WorkloadManagementSystem.Client.SandboxStoreClient import SandboxStoreClient

from WebAppDIRAC.Lib.WebHandler import WebHandler, WErr
Expand Down Expand Up @@ -375,12 +377,12 @@ def web_jobData(self, id: int, data_kind: str) -> dict:
return {"success": "false", "error": "StagerReport not available"}
return {"success": "false", "error": result["Message"]}
if data_kind == "getPilotStdOut":
if not (result := WebAppClient().getJobPilotOutput(id))["OK"]:
if not (result := WMSAdministratorClient().getJobPilotOutput(id))["OK"]:
return {"success": "false", "error": result["Message"]}
if "StdOut" in result["Value"]:
return {"success": "true", "result": result["Value"]["StdOut"]}
if data_kind == "getPilotStdErr":
if not (result := WebAppClient().getJobPilotOutput(id))["OK"]:
if not (result := WMSAdministratorClient().getJobPilotOutput(id))["OK"]:
return {"success": "false", "error": result["Message"]}
if "StdErr" in result["Value"]:
return {"success": "true", "result": result["Value"]["StdErr"]}
Expand Down
Loading