Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
envsetup
Manage
Activity
Members
Plan
Redmine
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mediaserver
envsetup
Commits
05377320
"...html/gst-plugins-good-plugins-plugin-audioparsers.html" did not exist on "45626bf9f45117638282511219a75553dd968950"
Commit
05377320
authored
8 years ago
by
Florent Thiery
Browse files
Options
Downloads
Patches
Plain Diff
improve mail title by adding the ms name
parent
6f0cc44f
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
tester.py
+3
-1
3 additions, 1 deletion
tester.py
with
3 additions
and
1 deletion
tester.py
+
3
−
1
View file @
05377320
...
@@ -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
'
))
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment