Skip to content
Snippets Groups Projects
Commit a06c453e authored by Brian Moe's avatar Brian Moe
Browse files

BCC-ed email alert recipients.

parent 75556638
No related branches found
No related tags found
No related merge requests found
......@@ -50,13 +50,15 @@ def issueAlertForLabel(event, label, doxmpp):
if event.group.name == "Test":
fromaddress = settings.ALERT_TEST_EMAIL_FROM
toaddresses = settings.ALERT_TEST_EMAIL_TO
bccaddresses = []
message += "\n\nWould have send email to: %s" % str(profileRecips)
else:
fromaddress = settings.ALERT_EMAIL_FROM
toaddresses = profileRecips
toaddresses = []
bccaddresses = profileRecips
if toaddresses:
email = EmailMessage(subject, message, fromaddress, toaddresses, [])
email = EmailMessage(subject, message, fromaddress, toaddresses, bccaddresses)
email.send()
......@@ -66,15 +68,17 @@ def issueEmailAlert(event, location):
if event.group.name == 'Test':
fromaddress = settings.ALERT_TEST_EMAIL_FROM
toaddresses = settings.ALERT_TEST_EMAIL_TO
bccaddresses = []
else:
fromaddress = settings.ALERT_EMAIL_FROM
toaddresses = settings.ALERT_EMAIL_TO
bccaddresses = settings.ALERT_EMAIL_BCC
atype = AnalysisType.objects.filter(code=event.analysisType)[0]
triggers = atype.trigger_set.filter(labels=None)
for trigger in triggers:
for recip in trigger.contacts.all():
toaddresses.append(recip.email)
bccaddresses.append(recip.email)
subject = "[gracedb] %s event. ID: %s" % (event.get_analysisType_display(), event.graceid())
message = """
......@@ -98,7 +102,7 @@ Event Summary:
indent(3, prepareSummary(event))
)
email = EmailMessage(subject, message, fromaddress, toaddresses, [])
email = EmailMessage(subject, message, fromaddress, toaddresses, bccaddresses)
email.send()
#send_mail(subject, message, fromaddress, toaddresses)
......
......@@ -12,14 +12,13 @@ MANAGERS = ADMINS
ALERT_EMAIL_FROM = "GraCEDb <gracedb@archie.phys.uwm.edu>"
ALERT_EMAIL_TO = [
# "patrick@gravity.phys.uwm.edu",
# "larry@gravity.phys.uwm.edu",
# "bmoe@gravity.phys.uwm.edu",
'Frederique Marion <marionf@lapp.in2p3.fr>',
"Benoit MOURS <mours@lapp.in2p3.fr>",
"Jonah Kanner <jkanner@umd.edu>",
"gracedb@listserv.ligo.org",
]
ALERT_EMAIL_BCC = [
"Frederique Marion <marionf@lapp.in2p3.fr>",
"Benoit MOURS <mours@lapp.in2p3.fr>",
"Jonah Kanner <jkanner@umd.edu>",
]
ALERT_TEST_EMAIL_FROM = "GraCEDb TEST <gracedb@archie.phys.uwm.edu>"
ALERT_TEST_EMAIL_TO = [
......
......@@ -12,8 +12,8 @@ MANAGERS = ADMINS
ALERT_EMAIL_FROM = "Dev Alert <root@moe.phys.uwm.edu>"
ALERT_EMAIL_TO = [
"Brian Moe <bmoe@gravity.phys.uwm.edu>",
"bmoe@uwm.edu",
]
ALERT_EMAIL_BCC = ["bmoe@uwm.edu"]
ALERT_TEST_EMAIL_FROM = "Dev Test Alert <root@moe.phys.uwm.edu>"
ALERT_TEST_EMAIL_TO = [
......
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