From d3f2d5c1395a4d8888d8d160cccf1aab5264bd13 Mon Sep 17 00:00:00 2001
From: Branson Stephens <branson@moe.phys.uwm.edu>
Date: Thu, 18 Oct 2012 15:20:56 -0500
Subject: [PATCH] Getting far threshold working.
---
gracedb/alert.py | 20 +++++++++++++++-----
settings/default.py | 6 +++++-
2 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/gracedb/alert.py b/gracedb/alert.py
index b7b7f6d73..b68ab1cbf 100644
--- a/gracedb/alert.py
+++ b/gracedb/alert.py
@@ -67,7 +67,6 @@ def issueAlertForLabel(event, label, doxmpp):
def issueEmailAlert(event, location):
-
# Gather Recipients
if event.group.name == 'Test':
fromaddress = settings.ALERT_TEST_EMAIL_FROM
@@ -77,18 +76,29 @@ def issueEmailAlert(event, location):
fromaddress = settings.ALERT_EMAIL_FROM
toaddresses = settings.ALERT_EMAIL_TO
bccaddresses = settings.ALERT_EMAIL_BCC
+# Branson debugging.
+# toaddresses = []
+# bccaddress = []
atype = AnalysisType.objects.filter(code=event.analysisType)[0]
triggers = atype.trigger_set.filter(labels=None)
+
+# Branson debugging.
+# dfile=open("/home/branson/gracedbdev/gracedb/dfile.txt", mode="w");
for trigger in triggers:
for recip in trigger.contacts.all():
- if trigger.farThresh == None:
+ if not trigger.farThresh:
bccaddresses.append(recip.email)
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)
-
+# Branson debugging.
+# dfile.close()
subject = "[gracedb] %s event. ID: %s" % (event.get_analysisType_display(), event.graceid())
message = """
New Event
diff --git a/settings/default.py b/settings/default.py
index 505bf1814..e04ba7691 100644
--- a/settings/default.py
+++ b/settings/default.py
@@ -160,7 +160,10 @@ TEMPLATE_CONTEXT_PROCESSORS = (
'middleware.debug.LigoDebugContext',
)
-AUTHENTICATION_BACKENDS = ('gracedb.middleware.auth.LigoAuthBackend',)
+AUTHENTICATION_BACKENDS = (
+ 'django.contrib.auth.backends.ModelBackend',
+ 'gracedb.middleware.auth.LigoAuthBackend',
+)
MIDDLEWARE_CLASSES = [
'middleware.accept.AcceptMiddleware',
@@ -169,6 +172,7 @@ MIDDLEWARE_CLASSES = [
'django.middleware.common.CommonMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
+ 'django.contrib.messages.middleware.MessageMiddleware',
]
ROOT_URLCONF = 'urls'
--
GitLab