commit 17823f37c5ac9d1f5e2ddc1199b61c7caaf26698
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date: Thu Feb 15 09:22:10 2018 +0100
Revert "Send report mails separately to requester and list"
This reverts commit b2bdcf0e31ca6676086e8a5fd72d9a80cec2725e.
In retrospect this is not helping.
It also started causing mx to reject mails because of increased send rate,
PLD_Builder/report.py | 28 ++++++++--------------------
1 file changed, 8 insertions(+), 20 deletions(-)
---
diff --git a/PLD_Builder/report.py b/PLD_Builder/report.py
index 865fa4a..f2b3436 100644
--- a/PLD_Builder/report.py
+++ b/PLD_Builder/report.py
@@ -72,8 +72,15 @@ def send_report(r, is_src = False):
subject += ' '.join((s_failed, s_ok)).strip()
m = mailer.Message()
+ m.set_headers(to = r.requester_email,
+ cc = config.builder_list,
+ subject = subject[0:100])
+ if is_src:
+ m.set_header("Message-ID", "<%s...@pld.src.builder>" % r.id)
+ else:
+ m.set_header("References", "<%s...@pld.src.builder>" % r.id)
+ m.set_header("In-Reply-To", "<%s...@pld.src.builder>" % r.id)
- m.write("Request by: %s\n\n" % r.requester_email)
for b in r.batches:
if b.build_failed and b.logfile == None:
info = b.skip_reason
@@ -93,25 +100,6 @@ def send_report(r, is_src = False):
m.append_log(b.logfile)
m.write("\n\n")
- m.set_headers(to = r.requester_email,
- subject = subject[0:100])
- if is_src:
- m.set_header("Message-ID", "<req...@pld.src.builder>" % r.id)
- else:
- m.set_header("References", "<req...@pld.src.builder>" % r.id)
- m.set_header("In-Reply-To", "<req...@pld.src.builder>" % r.id)
- m.send()
-
- m.remove_header("To")
- m.remove_header("Cc")
- m.set_header("To", config.builder_list)
- # reset Message-ID
- m.set_std_headers()
- if is_src:
- m.set_header("Message-ID", "<%s...@pld.src.builder>" % r.id)
- else:
- m.set_header("References", "<%s...@pld.src.builder>" % r.id)
- m.set_header("In-Reply-To", "<%s...@pld.src.builder>" % r.id)
m.send()
def send_cia_report(r, is_src = False):
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/projects/pld-builder.new.git/commitdiff/17823f37c5ac9d1f5e2ddc1199b61c7caaf26698
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
