From af6e2e9950b550c148c96312acdc500829cf76a2 Mon Sep 17 00:00:00 2001
From: chausman <chausman@nrao.edu>
Date: Fri, 26 Aug 2022 11:31:18 -0600
Subject: [PATCH] remove check for routing key
---
shared/workspaces/test/test_archive_service.py | 2 --
.../workspaces/workspaces/system/services/archive_service.py | 3 +--
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/shared/workspaces/test/test_archive_service.py b/shared/workspaces/test/test_archive_service.py
index 4f4f04816..2b540f962 100644
--- a/shared/workspaces/test/test_archive_service.py
+++ b/shared/workspaces/test/test_archive_service.py
@@ -135,7 +135,6 @@ class TestArchiveService:
Do not submit VLASS calibrations for ingestion.
"""
ingestion_message = {
- "routing_key": "i.am.key",
"user": "test_user",
"hostname": "hostname01",
"timestamp": {
@@ -180,7 +179,6 @@ class TestArchiveService:
Do not submit TSKY calibrations for ingestion.
"""
ingestion_message = {
- "routing_key": "i.am.key",
"user": "test_user",
"hostname": "hostname01",
"timestamp": {
diff --git a/shared/workspaces/workspaces/system/services/archive_service.py b/shared/workspaces/workspaces/system/services/archive_service.py
index 6f744d1ff..c97bf971f 100644
--- a/shared/workspaces/workspaces/system/services/archive_service.py
+++ b/shared/workspaces/workspaces/system/services/archive_service.py
@@ -194,13 +194,12 @@ class ArchiveService(ArchiveServiceIF):
"""
log_data = message["logData"]
- routing_key = message["routing_key"]
sdm_id = log_data["fileset_id"]
sb_type = log_data["schedblock_type"]
telescope = log_data["telescope"]
- if sb_type != "OBSERVER" or telescope != "EVLA" or "ingestion-complete.rawdata" not in routing_key:
+ if sb_type != "OBSERVER" or telescope != "EVLA":
# not a candidate for std_calibration
return None
--
GitLab