Skip to content
Snippets Groups Projects
Commit d3f2d5c1 authored by Branson Stephens's avatar Branson Stephens Committed by Branson Stephens
Browse files

Getting far threshold working.

parent ab0aff38
No related branches found
No related tags found
No related merge requests found
...@@ -67,7 +67,6 @@ def issueAlertForLabel(event, label, doxmpp): ...@@ -67,7 +67,6 @@ def issueAlertForLabel(event, label, doxmpp):
def issueEmailAlert(event, location): def issueEmailAlert(event, location):
# Gather Recipients # Gather Recipients
if event.group.name == 'Test': if event.group.name == 'Test':
fromaddress = settings.ALERT_TEST_EMAIL_FROM fromaddress = settings.ALERT_TEST_EMAIL_FROM
...@@ -77,18 +76,29 @@ def issueEmailAlert(event, location): ...@@ -77,18 +76,29 @@ def issueEmailAlert(event, location):
fromaddress = settings.ALERT_EMAIL_FROM fromaddress = settings.ALERT_EMAIL_FROM
toaddresses = settings.ALERT_EMAIL_TO toaddresses = settings.ALERT_EMAIL_TO
bccaddresses = settings.ALERT_EMAIL_BCC bccaddresses = settings.ALERT_EMAIL_BCC
# Branson debugging.
# toaddresses = []
# bccaddress = []
atype = AnalysisType.objects.filter(code=event.analysisType)[0] atype = AnalysisType.objects.filter(code=event.analysisType)[0]
triggers = atype.trigger_set.filter(labels=None) triggers = atype.trigger_set.filter(labels=None)
# Branson debugging.
# dfile=open("/home/branson/gracedbdev/gracedb/dfile.txt", mode="w");
for trigger in triggers: for trigger in triggers:
for recip in trigger.contacts.all(): for recip in trigger.contacts.all():
if trigger.farThresh == None: if not trigger.farThresh:
bccaddresses.append(recip.email) bccaddresses.append(recip.email)
else: else:
if event.far != None and event.far < trigger.farThresh: # Branson debugging.
# b2 = event.far < trigger.farThresh
# dfile.write("Second cond = %s\n" % b2);
if event.far and event.far < trigger.farThresh:
# toaddresses = settings.ALERT_EMAIL_TO
# bccaddresses = settings.ALERT_EMAIL_BCC
bccaddresses.append(recip.email) bccaddresses.append(recip.email)
# bccaddresses.append(recip.email) # Branson debugging.
# dfile.close()
subject = "[gracedb] %s event. ID: %s" % (event.get_analysisType_display(), event.graceid()) subject = "[gracedb] %s event. ID: %s" % (event.get_analysisType_display(), event.graceid())
message = """ message = """
New Event New Event
......
...@@ -160,7 +160,10 @@ TEMPLATE_CONTEXT_PROCESSORS = ( ...@@ -160,7 +160,10 @@ TEMPLATE_CONTEXT_PROCESSORS = (
'middleware.debug.LigoDebugContext', 'middleware.debug.LigoDebugContext',
) )
AUTHENTICATION_BACKENDS = ('gracedb.middleware.auth.LigoAuthBackend',) AUTHENTICATION_BACKENDS = (
'django.contrib.auth.backends.ModelBackend',
'gracedb.middleware.auth.LigoAuthBackend',
)
MIDDLEWARE_CLASSES = [ MIDDLEWARE_CLASSES = [
'middleware.accept.AcceptMiddleware', 'middleware.accept.AcceptMiddleware',
...@@ -169,6 +172,7 @@ MIDDLEWARE_CLASSES = [ ...@@ -169,6 +172,7 @@ MIDDLEWARE_CLASSES = [
'django.middleware.common.CommonMiddleware', 'django.middleware.common.CommonMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
] ]
ROOT_URLCONF = 'urls' ROOT_URLCONF = 'urls'
......
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