From e76051c6fa9be507a9a148035b31239d2cec2de6 Mon Sep 17 00:00:00 2001
From: Jake Smith <jws52@cam.ac.uk>
Date: Tue, 5 Jan 2021 16:34:55 +0000
Subject: [PATCH] Providing additional email for maintainer.
---
DataProcessor.pl | 2 +-
EnvProcessor.py | 5 +++--
ProjectConfig_Ethiopia.pl | 4 ++--
ProjectConfig_SouthAsia.pl | 2 +-
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/DataProcessor.pl b/DataProcessor.pl
index e0778be..2f10eb6 100755
--- a/DataProcessor.pl
+++ b/DataProcessor.pl
@@ -103,7 +103,7 @@ sub terminateRun {
sub handleError {
my $errorString = shift;
- my $maintainerRef = shift // \@maintainersCam;
+ my $maintainerRef = shift // \@maintainersAll;
my $severity = shift // $severityStringERROR;
diff --git a/EnvProcessor.py b/EnvProcessor.py
index 00ffd5d..49f395e 100644
--- a/EnvProcessor.py
+++ b/EnvProcessor.py
@@ -73,7 +73,7 @@ log_path_project = '/storage/app/EWS/General/EWS-Coordinator/logs/log_env.txt'
# log will be written here until a job directory exits, when it will be moved there
log_path_default = f"/storage/app/EWS/General/EWS-Coordinator/logs/log_env_{nowString}.txt"
-maintainers = ['jws52@cam.ac.uk','tm689@cam.ac.uk','rs481@cam.ac.uk']
+maintainers = ['jws52@cam.ac.uk','tm689@cam.ac.uk','rs481@cam.ac.uk','willthurston@gmail.com']
with open('/storage/app/EWS/General/EWS-Coordinator/Cred_gmail.json','r') as f:
gmailConfig = json.load(f)
@@ -403,12 +403,13 @@ def process_pre_job(input_args):
return
+# TODO: Test this out
def process_copy_past_job_env2_0(jobPath,config):
'''For when we want to skip process_in_job() to test the other components of
this script. Currently hard-wired.'''
# TODO: remove this hard-wired assumption
- jobPath_to_copy = f"{jobPath}/../{startstring}_bak/"
+ jobPath_to_copy = f"{jobPath}/../ENVIRONMENT_2.0_{startstring}_bak/"
assert os.path.exists(jobPath_to_copy)
diff --git a/ProjectConfig_Ethiopia.pl b/ProjectConfig_Ethiopia.pl
index ac2465d..c29dd4d 100644
--- a/ProjectConfig_Ethiopia.pl
+++ b/ProjectConfig_Ethiopia.pl
@@ -7,7 +7,7 @@ sub get_project_name { return "Ethiopia" };
sub get_project_path { return "/storage/app/EWS/Ethiopia/" };
sub get_maintainers_cam { return ("jws52\@cam.ac.uk", "tm689\@cam.ac.uk", "rs481\@cam.ac.uk")};
-sub get_maintainers_all { return ("jws52\@cam.ac.uk", "tm689\@cam.ac.uk", "rs481\@cam.ac.uk", "william.thurston\@metoffice.gov.uk")};
+sub get_maintainers_all { return ("jws52\@cam.ac.uk", "tm689\@cam.ac.uk", "rs481\@cam.ac.uk", "william.thurston\@metoffice.gov.uk","willthurston\@gmail.com")};
# Survey processing
sub get_project_surveys_from_ODK { return 1 };
@@ -37,4 +37,4 @@ sub get_env_plotting_opts{ return " FALSE no_leaf" };
sub get_env_plot_output_path {return "plotting/"};
sub get_env_plotting_output_glob {return "ethiopia/images/{Daily,Weekly}" };
-1;
\ No newline at end of file
+1;
diff --git a/ProjectConfig_SouthAsia.pl b/ProjectConfig_SouthAsia.pl
index d591cd0..4353e8c 100644
--- a/ProjectConfig_SouthAsia.pl
+++ b/ProjectConfig_SouthAsia.pl
@@ -7,7 +7,7 @@ sub get_project_name { return "SouthAsia" };
sub get_project_path { return "/storage/app/EWS/SouthAsia/" };
sub get_maintainers_cam { return ("jws52\@cam.ac.uk", "tm689\@cam.ac.uk", "rs481\@cam.ac.uk")};
-sub get_maintainers_all { return ("jws52\@cam.ac.uk", "tm689\@cam.ac.uk", "rs481\@cam.ac.uk", "william.thurston\@metoffice.gov.uk")};
+sub get_maintainers_all { return ("jws52\@cam.ac.uk", "tm689\@cam.ac.uk", "rs481\@cam.ac.uk", "william.thurston\@metoffice.gov.uk","willthurston\@gmail.com")};
# Survey processing
sub get_project_surveys_from_ODK { return 1 };
--
GitLab