Skip to content
Snippets Groups Projects
Commit dbe8a096 authored by Charlotte Hausman's avatar Charlotte Hausman
Browse files

Fix ingest seci

parent cf2e72b9
No related branches found
No related tags found
2 merge requests!1390Catch up with Main,!1317Fix ingest seci
Pipeline #9526 passed
Pipeline: workspaces

#9528

    Pipeline: workspaces

    #9527

      ...@@ -26,6 +26,7 @@ import ( ...@@ -26,6 +26,7 @@ import (
      "io" "io"
      "io/ioutil" "io/ioutil"
      "net/http" "net/http"
      "net/url"
      "path/filepath" "path/filepath"
      ) )
      ...@@ -38,6 +39,7 @@ type CapoInput struct { ...@@ -38,6 +39,7 @@ type CapoInput struct {
      CapoProfile string CapoProfile string
      } }
      //checkError
      /** /**
      * Check if an error happened and panic on it if so * Check if an error happened and panic on it if so
      * *
      ...@@ -79,7 +81,7 @@ func GetCalibrationLocator(imgSetPath string, input CapoInput) string { ...@@ -79,7 +81,7 @@ func GetCalibrationLocator(imgSetPath string, input CapoInput) string {
      imgSet := filepath.Base(imgSetPath) imgSet := filepath.Base(imgSetPath)
      // Make the REST call // Make the REST call
      lookupUrl := locatorEndpoint + imgSet lookupUrl := locatorEndpoint + url.QueryEscape(imgSet)
      resp, err := http.Get(lookupUrl) resp, err := http.Get(lookupUrl)
      checkError(err) checkError(err)
      ......
      ...@@ -160,7 +160,7 @@ def send_aat_image_message(parameters: dict, ingest_type: Union[IngestType, VLAS ...@@ -160,7 +160,7 @@ def send_aat_image_message(parameters: dict, ingest_type: Union[IngestType, VLAS
      if response.status_code != http.HTTPStatus.OK: if response.status_code != http.HTTPStatus.OK:
      logger.warning( logger.warning(
      f"WARNING: Failed to send image ingestion complete to archive for image associated with" f"WARNING: Failed to send image ingestion complete to archive for image associated with "
      f"calibration {parameters['calSpl']} and project {parameters['project']}." f"calibration {parameters['calSpl']} and project {parameters['project']}."
      f" Please set off the index manually!" f" Please set off the index manually!"
      ) )
      ......
      ...@@ -278,7 +278,12 @@ class ArchiveMessageArchitect(MessageArchitectIF): ...@@ -278,7 +278,12 @@ class ArchiveMessageArchitect(MessageArchitectIF):
      template = self.get_message_template(msg_type) template = self.get_message_template(msg_type)
      template = template.copy() template = template.copy()
      # not using full request for AAT/VLASS messages, increased size caused VLASS message handling issues # not using full request for AAT/VLASS messages, increased size caused VLASS message handling issues
      template["subject"] = f"WS workflow request #{self.request.workflow_request_id}" # image indexing is based on project not request id, use different subject
      template["subject"] = (
      f"WS workflow triggering indexer for {self.project}"
      if self.key == "ingestor.images"
      else f"WS workflow request #{self.request.workflow_request_id}"
      )
      template["routing_key"] = self.key template["routing_key"] = self.key
      if "vlass" in msg_type and "update" not in msg_type: if "vlass" in msg_type and "update" not in msg_type:
      ......
      0% Loading or .
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment