Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
genotoul-bioinfo
D-GENIES
Commits
dd238c06
Commit
dd238c06
authored
Apr 10, 2018
by
Floreal Cabanettes
Browse files
Fix send mail
parent
ca45515c
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/dgenies/lib/job_manager.py
View file @
dd238c06
...
...
@@ -155,11 +155,12 @@ class JobManager:
else
:
message
+=
"Your job %s has failed. You can try again. "
\
"If the problem persists, please contact the support.
\n\n
"
%
self
.
id_job
message
+=
"Sequences compared in this analysis:
\n
"
if
query_name
is
not
None
:
message
+=
"Target: %s
\n
Query: %s
\n\n
"
%
(
target_name
,
query_name
)
else
:
message
+=
"Target: %s
\n\n
"
%
target_name
if
target_name
is
not
None
:
message
+=
"Sequences compared in this analysis:
\n
"
if
query_name
is
not
None
:
message
+=
"Target: %s
\n
Query: %s
\n\n
"
%
(
target_name
,
query_name
)
else
:
message
+=
"Target: %s
\n\n
"
%
target_name
if
status
==
"success"
:
if
self
.
is_target_filtered
():
message
+=
str
(
"Note: target fasta has been filtered because it contains too small contigs."
...
...
@@ -179,7 +180,7 @@ class JobManager:
template
=
Template
(
t_file
.
read
())
return
template
.
render
(
job_name
=
self
.
id_job
,
status
=
status
,
url_base
=
self
.
config
.
web_url
,
query_name
=
query_name
if
query_name
is
not
None
else
""
,
target_name
=
target_name
,
target_name
=
target_name
if
target_name
is
not
None
else
""
,
error
=
self
.
error
,
target_filtered
=
self
.
is_target_filtered
(),
query_filtered
=
self
.
is_query_filtered
())
...
...
@@ -198,12 +199,16 @@ class JobManager:
status
=
job
.
status
self
.
error
=
job
.
error
with
open
(
self
.
idx_t
,
"r"
)
as
idxt
:
target_name
=
idxt
.
readline
().
rstrip
()
with
open
(
self
.
idx_q
,
"r"
)
as
idxq
:
query_name
=
idxq
.
readline
().
rstrip
()
if
query_name
==
target_name
:
query_name
=
None
target_name
=
None
if
os
.
path
.
exists
(
self
.
idx_t
):
with
open
(
self
.
idx_t
,
"r"
)
as
idxt
:
target_name
=
idxt
.
readline
().
rstrip
()
query_name
=
None
if
os
.
path
.
exists
(
self
.
idx_q
):
with
open
(
self
.
idx_q
,
"r"
)
as
idxq
:
query_name
=
idxq
.
readline
().
rstrip
()
if
query_name
==
target_name
:
query_name
=
None
# Send:
self
.
mailer
.
send_mail
(
recipients
=
[
self
.
email
],
...
...
src/dgenies/lib/mail_templates/job_notification.html
View file @
dd238c06
...
...
@@ -43,11 +43,13 @@
{% endif %}
{% endif %}
<p>
Sequences compared in this analysis:
</p>
<p><em>
Target:
</em>
{{ target_name }}
<br/>
{% if query_name != "" %}
<em>
Query:
</em>
{{ query_name }}
</p>
{% if target_name != "" %}
<p>
Sequences compared in this analysis:
</p>
<p><em>
Target:
</em>
{{ target_name }}
{% if query_name != "" %}
<br/><em>
Query:
</em>
{{ query_name }}
{% endif %}
</p>
{% endif %}
{% if status == "success" %}
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment