Skip to content
Snippets Groups Projects
Commit f25e501b authored by Zoltan Mathe's avatar Zoltan Mathe
Browse files

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
......@@ -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 )
......
......@@ -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:
......
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