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

Allowed PPR_FILENAME to be unset, removed unnecessary checks

parent f3839aa5
No related branches found
No related tags found
2 merge requests!1706merge 2.8.4 to main,!1657Got EVLA CMS restores working via casa_envoy, using casa_restorepipescript.py when it exists
......@@ -36,14 +36,19 @@ class CasaConfigure:
"""
Set required environment variables
No need to audit them afterwards for None's since the keys and values in `os.environ` must all be strings.
Source: https://docs.python.org/3.10/library/os.html#os.environ
:return:
"""
os.environ["SCIPIPE_ROOTDIR"] = self.parameters["rootDirectory"]
# If user specified CASA Version, use it.
if "casaHome" in self.metadata_content:
os.environ["CASA_HOME"] = self.metadata_content.get("casaHome")
elif "main" in self.metadata_content and "CASA_HOME" in self.metadata_content["main"]:
if self.metadata_content.get("casaHome") is not None:
os.environ["CASA_HOME"] = self.metadata_content["casaHome"]
elif (
self.metadata_content.get("main") is not None and self.metadata_content["main"].get("CASA_HOME") is not None
):
# Catch case of VLASS nesting
os.environ["CASA_HOME"] = self.metadata_content["main"]["CASA_HOME"]
else:
......@@ -54,31 +59,23 @@ class CasaConfigure:
os.environ["CASA_HOME"] = self.parameters["homeForReprocessing"]
os.environ["LANG"] = "en_US.UTF-8"
os.environ["PPR_FILENAME"] = self.parameters["ppr"]
# Restores oftentimes use a piperestorescript instead of a PPR.xml
# AuditFiles would catch an erroneously absent PPR
if self.parameters.get("ppr") is not None:
os.environ["PPR_FILENAME"] = self.parameters["ppr"]
self.check_processing_env()
self.log_processing_env()
def check_processing_env(self):
def log_processing_env(self):
"""
Varify processing environment is ready for CASA
Log out environment variables relevant to CASA
:return:
"""
self.logger.info("Checking processing environment:")
env_list = ["SCIPIPE_ROOTDIR", "CASA_HOME", "PPR_FILENAME", "LANG"]
result_list = []
for var in env_list:
env = os.environ.get(var)
result_list.append(env)
self.logger.info(f"{var}: {env}")
if "None" in result_list:
self.logger.error("Environment setup Failed!")
sys.exit(1)
else:
self.logger.info("Environment ready for processing")
self.logger.info(f"{var}: {os.environ.get(var)}")
class StandardRunner(RunnerABC):
......
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