Skip to content
Snippets Groups Projects
Commit 83596758 authored by Sam Kagan's avatar Sam Kagan
Browse files

Added CAPO property for VLA pipe ops leads email, used it for ws_ann

parent 1c26be09
No related branches found
No related tags found
2 merge requests!1706merge 2.8.4 to main,!1667Change email for annihilator failure
......@@ -90,7 +90,7 @@ def _get_settings(profile: str) -> Settings:
workflow_url = config.settings("edu.nrao.workspaces.WorkflowSettings").serviceUrl
notification_url = notification_settings.serviceUrl
failure_notification_email = notification_settings.analystEmail
failure_notification_email = notification_settings.vlaPipeOpsLeadsEmail
cache_directory = config.settings("edu.nrao.workspaces.DeliverySettings").cacheWeblogDirectory
spool_directory = config.settings("edu.nrao.workspaces.ProcessingSettings").rootDirectory
staging_directory = ingestion_settings.stagingDirectory
......@@ -500,8 +500,9 @@ class CalibrationAnnihilator(WorkflowAnnihilator):
params = {
"wf_name": self._workflow,
"time_to_keep": (datetime.datetime.now() - relativedelta(days=int(self.get_days_to_keep("calibration"))))
.strftime('%Y-%m-%d %H:%M:%S'),
"time_to_keep": (
datetime.datetime.now() - relativedelta(days=int(self.get_days_to_keep("calibration")))
).strftime("%Y-%m-%d %H:%M:%S"),
}
return self.get_stale_directories_from_query(query, params)
......@@ -534,8 +535,9 @@ class ImageAnnihilator(WorkflowAnnihilator):
params = {
"wf_name": self._workflow,
"time_to_keep": (datetime.datetime.now() - relativedelta(days=int(self.get_days_to_keep("image"))))
.strftime('%Y-%m-%d %H:%M:%S'),
"time_to_keep": (
datetime.datetime.now() - relativedelta(days=int(self.get_days_to_keep("image")))
).strftime("%Y-%m-%d %H:%M:%S"),
}
stales = self.get_stale_directories_from_query(query, params)
......@@ -570,8 +572,9 @@ class ImageAnnihilator(WorkflowAnnihilator):
params = {
"wf_name": self._workflow,
"cal_wf_name": TypedAnnihilators.CAL.value,
"time_to_keep": (datetime.datetime.now() - relativedelta(days=int(self.get_days_to_keep("image"))))
.strftime('%Y-%m-%d %H:%M:%S'),
"time_to_keep": (
datetime.datetime.now() - relativedelta(days=int(self.get_days_to_keep("image")))
).strftime("%Y-%m-%d %H:%M:%S"),
}
stales.extend(self.get_stale_directories_from_query(query, params))
......
......@@ -75,6 +75,7 @@ edu.nrao.workspaces.ProductFetcherSettings.executionSite = local_test
# Notification Settings
#
edu.nrao.workspaces.NotificationSettings.analystEmail = workspaces-analysts-test@listmgr.nrao.edu
edu.nrao.workspaces.NotificationSettings.vlaPipeOpsLeadsEmail = fake-vla-pipe-ops-leads@listmgr.nrao.edu
edu.nrao.workspaces.NotificationSettings.sendPIEmail = False
#
......
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