diff --git a/services/workflow/workflow/server.py b/services/workflow/workflow/server.py index a6725959f9a80190bbc9668298f67d4c6fd231b8..5aa9c05614884e27b9ca125e046e3d0dfee5d657 100644 --- a/services/workflow/workflow/server.py +++ b/services/workflow/workflow/server.py @@ -70,6 +70,7 @@ def lookup_workflow(request: Request) -> Workflow: :param request: an HTTP request :return: a Workflow object """ + return request.info.lookup_workflow_definition(request.matchdict["name"]) diff --git a/shared/workspaces/workspaces/workflow/services/workflow_service.py b/shared/workspaces/workspaces/workflow/services/workflow_service.py index c2658874d0d02e0fecff810860c9f68cb4baf49f..151c04ae7636268ed1920a060a339a835d17ee6a 100644 --- a/shared/workspaces/workspaces/workflow/services/workflow_service.py +++ b/shared/workspaces/workspaces/workflow/services/workflow_service.py @@ -820,7 +820,7 @@ class WorkflowMessageHandler: # find the path to the delivery.json file delivery_file = pathlib.Path(wf_request.results_dir) / "delivery.json" - + logger.info(f"workflow type {wf_request.workflow_name} trying to send delivery message to {controller}") # does it exist? if so, we need to send out a new event with its contents if delivery_file.exists(): logger.debug("Found delivery.json file, sending delivery notification") @@ -836,6 +836,7 @@ class WorkflowMessageHandler: # send the message self.messenger.send_message(**msg) elif controller.control_system == "AAT": + logger.info(f"Attempting to send delivery notification to AAT from propagate delivery") # construct the AAT message routing_key = f"ws-workflow.download.{wf_request.workflow_request_id}" msg = ArchiveMessageArchitect( @@ -1075,7 +1076,9 @@ class WorkflowMessageHandler: return False def _post_workflow_cleanup(self, message: Dict, request: WorkflowRequest, event_type: str): + logger.info(f"Controller for workflow request {request.workflow_request_id} is {request.controller}") if any(c.control_system == request.controller for c in self.info.all_external_controllers()): + logger.info(f"Attempting to send final message to {request.controller} for {request.workflow_request_id}") self.send_external_event(event_type, **message) self.clean_remote_workflow(request) @@ -1112,6 +1115,7 @@ class WorkflowMessageHandler: return False self.info.save_progress(request, stage, start, end) + logger.info(f"Updated current stage of {request.workflow_request_id}") return { "stage_info": { "stage": stage, @@ -1146,6 +1150,10 @@ class WorkflowMessageHandler: if controller.control_system == "AAT": # download_complete will be sent from propagate_delivery method if wf_request.workflow_name == "download" and event_type == "complete": + logger.info( + f"Tried to send download workflow complete event from send_external_event to {controller.control_system}" + ) + return if wf_request.workflow_name == "carta":