From b37c6ec2f30e389de37c0ac0bca56e130d785e9f Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Thu, 16 Mar 2017 11:04:40 +0000
Subject: [PATCH] Task #10494: fixed sciencesupport email address in LOFAR 2.20
 branch

---
 .../framework/lofarpipe/support/loggingdecorators.py  | 11 ++---------
 .../LTAIngestServer/LTAIngestServerCommon/config.py   |  2 +-
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/CEP/Pipeline/framework/lofarpipe/support/loggingdecorators.py b/CEP/Pipeline/framework/lofarpipe/support/loggingdecorators.py
index ee2464ce4f2..b0cb1326917 100644
--- a/CEP/Pipeline/framework/lofarpipe/support/loggingdecorators.py
+++ b/CEP/Pipeline/framework/lofarpipe/support/loggingdecorators.py
@@ -158,17 +158,10 @@ def mail_log_on_exception(target):
                 msg_string = "duration: {0} \n "\
                  "No additional pipeline data available".format(duration_recipe)
     
-            _mail_msg_to("pipeline_finished", "klijn@astron.nl",
-                         "pipeline finished: {0}: {1}".format(
-                                os.path.basename(calling_object.__file__),
-                                calling_object.inputs['job_name']),
-                         msg_string)
-
         except Exception, message:
             # Static list of mail to be send
-            mail_list = ["klijn@astron.nl", 
-                         "orru@astron.nl",
-                         "sciencesupport@astron.nl"
+            mail_list = ["orru@astron.nl",
+                         "sos@astron.nl"
                          ]
 
             # get the active stack
diff --git a/LTA/LTAIngest/LTAIngestServer/LTAIngestServerCommon/config.py b/LTA/LTAIngest/LTAIngestServer/LTAIngestServerCommon/config.py
index c829c2f9bdd..a68d3e2ee4b 100644
--- a/LTA/LTAIngest/LTAIngestServer/LTAIngestServerCommon/config.py
+++ b/LTA/LTAIngest/LTAIngestServer/LTAIngestServerCommon/config.py
@@ -34,5 +34,5 @@ TRANSFER_TIMEOUT = 300
 
 FINISHED_NOTIFICATION_MAILING_LIST=['schaap@astron.nl','softwaresupport@astron.nl']
 if isProductionEnvironment():
-    FINISHED_NOTIFICATION_MAILING_LIST += ['observer@astron.nl','sciencesupport@astron.nl']
+    FINISHED_NOTIFICATION_MAILING_LIST += ['observer@astron.nl','sos@astron.nl']
 
-- 
GitLab