Skip to content
Snippets Groups Projects
Commit 05377320 authored by Florent Thiery's avatar Florent Thiery
Browse files

improve mail title by adding the ms name

parent 6f0cc44f
No related branches found
No related tags found
No related merge requests found
...@@ -343,13 +343,14 @@ class Tester(): ...@@ -343,13 +343,14 @@ class Tester():
log('Too many consecutive tester failures: %s, no email will be sent.' % consecutive_failures) log('Too many consecutive tester failures: %s, no email will be sent.' % consecutive_failures)
if send_email: if send_email:
recipients = utils.get_conf('EMAIL_ADMINS') recipients = utils.get_conf('EMAIL_ADMINS')
mediaserver_name = utils.get_conf('MS_SERVER_NAME')
if not recipients: if not recipients:
log('No recipients defined for email sending. Set a value for EMAIL_ADMINS.') log('No recipients defined for email sending. Set a value for EMAIL_ADMINS.')
return 1 return 1
boundary = str(uuid.uuid4()) boundary = str(uuid.uuid4())
mail = '''From: %(hostname)s <noreply@ubicast.eu> mail = '''From: %(hostname)s <noreply@ubicast.eu>
To: %(recipients)s To: %(recipients)s
Subject: %(hostname)s UbiCast MediaServer functional tests report: %(status)s Subject: %(mediaserver_name)s (%(hostname)s) MediaServer health report: %(status)s
Mime-Version: 1.0 Mime-Version: 1.0
Content-type: multipart/related; boundary="%(boundary)s" Content-type: multipart/related; boundary="%(boundary)s"
...@@ -374,6 +375,7 @@ Content-transfer-encoding: utf-8 ...@@ -374,6 +375,7 @@ Content-transfer-encoding: utf-8
report=html_report, report=html_report,
log_name=log_name, log_name=log_name,
log_content=log_content, log_content=log_content,
mediaserver_name=mediaserver_name,
) )
p = subprocess.Popen(['sendmail', '-t'], stdin=subprocess.PIPE, stdout=sys.stdout.stream, stderr=sys.stderr.stream) p = subprocess.Popen(['sendmail', '-t'], stdin=subprocess.PIPE, stdout=sys.stdout.stream, stderr=sys.stderr.stream)
p.communicate(input=mail.encode('utf-8')) p.communicate(input=mail.encode('utf-8'))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment