diff options
| author | Michael Elkins <melkins@tislabs.com> | 2013-04-03 18:45:06 +0000 |
|---|---|---|
| committer | Michael Elkins <melkins@tislabs.com> | 2013-04-03 18:45:06 +0000 |
| commit | 4a8f6d69c9950fd8509f0f3462ad50ad341d6725 (patch) | |
| tree | 456c7ea36fd5566cd6995d0a3b4e1871ab2e5fb0 /rpkid/rpki/gui/cacheview/util.py | |
| parent | d0e81d8047779b7889e8773c964c2a35c1674dc4 (diff) | |
remove get_email_list() and replace with calls to Conf.send_alert()
svn path=/branches/tk500/; revision=5260
Diffstat (limited to 'rpkid/rpki/gui/cacheview/util.py')
| -rw-r--r-- | rpkid/rpki/gui/cacheview/util.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/rpkid/rpki/gui/cacheview/util.py b/rpkid/rpki/gui/cacheview/util.py index 8ba7d89f..fdb3e370 100644 --- a/rpkid/rpki/gui/cacheview/util.py +++ b/rpkid/rpki/gui/cacheview/util.py @@ -29,12 +29,10 @@ from cStringIO import StringIO from django.db import transaction import django.db.models -from django.core.mail import send_mail import rpki import rpki.gui.app.timestamp -from rpki.gui.app.models import Conf -from rpki.gui.app.glue import get_email_list +from rpki.gui.app.models import Conf, Alert from rpki.gui.cacheview import models from rpki.rcynic import rcynic_xml_iterator, label_iterator from rpki.sundial import datetime @@ -358,7 +356,6 @@ def notify_invalid(): for handle, v in notify.iteritems(): conf = Conf.objects.get(handle) - emails = get_email_list(conf) msg = StringIO() msg.write('This is an alert about problems with objects published by ' @@ -394,7 +391,7 @@ record, or is the default email address for this resource holder account on from_email = 'root@' + getfqdn() subj = 'invalid RPKI object alert for resource handle %s' % conf.handle - send_mail(subj, msg.getvalue(), from_email, emails) + conf.send_alert(subj, msg.getvalue(), from_email, severity=Alert.ERROR) def import_rcynic_xml(root=default_root, logfile=default_logfile): |