log error and use default if template for mail is not found

genouest · Jun 26, 2020 · 98689f9 · 98689f9
1 parent acf9456
commit 98689f9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,5 +1,6 @@
-3.1.18 [UNRELEASED]:
+3.1.18:
   If multiple files match release.file, take most recent one
+  If mail template not found, log and use default
 3.1.17:
   Fix regression when saving file with a differe,t structure such as xxx/(FASTA)/(file.txt) to save under FASTA/file.txt
   Send removal mail for --remove-all option

diff --git a/biomaj/notify.py b/biomaj/notify.py
@@ -95,8 +95,11 @@ def notifyBankAction(bank, with_log=True, with_msg=''):
             'remove': bank.session.get('remove')
         }
 
-        if bank.config.get('mail.template.subject', default=None):
-            template_file = bank.config.get('mail.template.subject')
+        template_file = bank.config.get('mail.template.subject', default=None)
+        if template_file and not os.path.exists(template_file):
+                logging.error('Template file not found: %s' % template_file)
+                template_file = None
+        if template_file:
             template = None
             with open(template_file) as file_:
                 template = Template(file_.read())
@@ -108,8 +111,11 @@ def notifyBankAction(bank, with_log=True, with_msg=''):
         else:
             msg['Subject'] = 'BANK[' + bank.name + '] - STATUS[' + str(bank.session.get_status(Workflow.FLOW_OVER)) + '] - UPDATE[' + str(bank.session.get('update')) + '] - REMOVE[' + str(bank.session.get('remove')) + ']' + ' - RELEASE[' + str(bank.session.get('release')) + ']'
 
-        if bank.config.get('mail.template.body', default=None):
-            template_file = bank.config.get('mail.template.body')
+        template_file = bank.config.get('mail.template.body', None)
+        if template_file and not os.path.exists(template_file):
+                logging.error('Template file not found: %s' % template_file)
+                template_file = None
+        if template_file:
             template = None
             with open(template_file) as file_:
                 template = Template(file_.read())

diff --git a/biomaj/workflow.py b/biomaj/workflow.py
@@ -753,6 +753,7 @@ def wf_release(self):
                 return False
 
             release_downloader.match([cf.get('release.file')], file_list, dir_list)
+
             if len(release_downloader.files_to_download) == 0:
                 logging.error('release.file defined but does not match any file')
                 self._close_download_service(dserv)
@@ -768,7 +769,7 @@ def wf_release(self):
                 else:
                     rel = re.search(cf.get('release.file'), release_downloader.files_to_download[0]['name'])
                 if rel is None:
-                    logging.error('release.file defined but does not match any file')
+                    logging.error('release.file defined but could not match any file')
                     self._close_download_service(dserv)
                     return False
                 release = rel.group(1)