From eefeac5f945b3a0ee804efc78943f29219535f8a Mon Sep 17 00:00:00 2001 From: wangchong1995924 <15229716099@163.com> Date: Thu, 1 Jul 2021 09:20:32 +0800 Subject: [PATCH] fix sending empty mail and adding retry --- core/obs_mail_notice.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/core/obs_mail_notice.py b/core/obs_mail_notice.py index 273d7cd..02909f8 100644 --- a/core/obs_mail_notice.py +++ b/core/obs_mail_notice.py @@ -147,12 +147,18 @@ class ObsMailNotice(object): with ThreadPoolExecutor(10) as executor: for pkg in self.failed_pkglist: executor.submit(self._get_pkg_owner_email, proj, pkg, status) - message = self._edit_email_content() - ret = self._send_email(message) - if ret == 0: - log.info("send email succeed !") + if self.to_addr_list: + message = self._edit_email_content() + for x in range(5): + ret = self._send_email(message) + if ret == 0: + log.info("send email succeed !") + sys.exit(0) + else: + log.error("send email failed, Error:%s" % ret) + raise SystemExit("Failed to send email!") else: - log.error("send email failed, Error:%s" % ret) + log.info("No build failed or unresolvable packages.") if __name__ == "__main__": -- Gitee