Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
LHCbDIRAC
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Anton Lu
LHCbDIRAC
Commits
f25e501b
Commit
f25e501b
authored
7 years ago
by
Zoltan Mathe
Browse files
Options
Downloads
Plain Diff
Merge branch 'avoidSpam' into 'master'
Avoiding spam emails See merge request !363
parents
a9887d5b
8dd5614e
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
LHCbDIRAC/Core/scripts/dirac-architecture.py
+2
-1
2 additions, 1 deletion
LHCbDIRAC/Core/scripts/dirac-architecture.py
LHCbDIRAC/TransformationSystem/Agent/MCSimulationTestingAgent.py
+1
-1
1 addition, 1 deletion
...AC/TransformationSystem/Agent/MCSimulationTestingAgent.py
with
3 additions
and
2 deletions
LHCbDIRAC/Core/scripts/dirac-architecture.py
+
2
−
1
View file @
f25e501b
...
...
@@ -49,7 +49,8 @@ if __name__ == "__main__" :
for
mA
in
mailAddress
.
replace
(
'
'
,
''
).
split
(
'
,
'
):
NotificationClient
().
sendMail
(
mailAddress
,
"
Problem with DIRAC architecture
"
,
body
,
'
federico.stagni@cern.ch
'
,
localAttempt
=
False
)
body
,
'
federico.stagni@cern.ch
'
,
localAttempt
=
False
,
avoidSpam
=
True
)
print
msg
dExit
(
1
)
...
...
This diff is collapsed.
Click to expand it.
LHCbDIRAC/TransformationSystem/Agent/MCSimulationTestingAgent.py
+
1
−
1
View file @
f25e501b
...
...
@@ -196,7 +196,7 @@ class MCSimulationTestingAgent ( AgentModule ):
if
not
self
.
email
:
self
.
email
=
getUserOption
(
self
.
operations
.
getValue
(
"
Shifter/ProductionManager/User
"
),
'
Email
'
)
body
=
'
\n
'
.
join
(
report
[
'
body
'
]
)
res
=
self
.
notifyClient
.
sendMail
(
self
.
email
,
report
[
'
subject
'
],
body
,
self
.
email
)
res
=
self
.
notifyClient
.
sendMail
(
self
.
email
,
report
[
'
subject
'
],
body
,
self
.
email
,
localAttempt
=
False
,
avoidSpam
=
True
)
if
not
res
[
'
OK
'
]:
self
.
log
.
error
(
"
sendMail failed
"
,
res
[
'
Message
'
]
)
else
:
...
...
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