Implement log sender for new planet admin

Instead of sending an email to the planet list, send individual emails to the
blog authors and ask them to fix their  blogs if more than a certain number
of fetches have failed. Now that we can archive blogs, this makes more sense,
and as the planet team doesn't actually do anything with the emails there anyway,
there is no point to keep sending them.

diff --git a/hamnadmin/hamnadmin/register/management/commands/send_logs.py b/hamnadmin/hamnadmin/register/management/commands/send_logs.py
new file mode 100644 (file)
index 0000000..d227a2d
--- /dev/null
+++ b/hamnadmin/hamnadmin/register/management/commands/send_logs.py
@@ -0,0 +1,56 @@
+from django.core.management.base import BaseCommand
+from django.db import transaction
+from django.db.models import Count
+from django.conf import settings
+
+from datetime import datetime, timedelta
+
+from hamnadmin.mailqueue.util import send_simple_mail
+from hamnadmin.register.models import Blog
+
+# Number of errors in the past 24 hours to trigger email
+THRESHOLD=20
+
+class Command(BaseCommand):
+       help = "Send planet aggregation logs to blog owners"
+
+       def handle(self, *args, **options):
+               with transaction.atomic():
+                       for feed in Blog.objects.filter(archived=False,
+                                                                                       aggregatorlog__success=False,
+                                                                                       aggregatorlog__ts__gt=datetime.now()-timedelta(days=1),
+                                                                                       ).annotate(
+                                                                                               num=Count("aggregatorlog__id")
+                                                                                       ).filter(num__gt=THRESHOLD).order_by():
+                               # We assume this is only run once a day, so just generate one email
+                               send_simple_mail(settings.EMAIL_SENDER,
+                                                                feed.user.email,
+                                                                "Errors retreiving your feed for Planet PostgreSQL",
+                                                                u"""Your blog aggregated to Planet PostgreSQL with feed URL
+
+{0}
+
+has failed {1} times in the past 24 hours. To view the details of
+the failures, please go to
+
+https://planet.postgresql.org/register/edit/{2}/
+
+using your normal PostgreSQL community login. From this page you
+will be able to see what the errors were, so that you can correct
+them.
+
+If this is a blog that is no longer active, please go to the same
+page linked above, and click the button to Archive the blog. That
+will prevent Planet PostgreSQL from trying to fetch new entries,
+and also stop these messages from being sent.
+
+A message like this will be sent once a day as long as your blog
+is generating more than {3} errors per day.
+
+""".format(feed.feedurl,
+                  feed.num,
+                  feed.id,
+                  THRESHOLD),
+                                                                sendername="Planet PostgreSQL",
+                                                                receivername=u"{0} {1}".format(feed.user.first_name, feed.user.last_name),
+                                                                )

diff --git a/logmailer.py b/logmailer.py
deleted file mode 100755 (executable)
index b3b231f..0000000
--- a/logmailer.py
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/usr/bin/env python
-# vim: ai ts=4 sts=4 sw=4
-"""PostgreSQL Planet Aggregator
-
-This file contains the functions to email a report of failed fetches
-by reading the aggregator log table in the database.
-
-Current version just sends a single summary report. A future enhancement
-could be to send reports directly to individual blog owners.
-
-Copyright (C) 2009 PostgreSQL Global Development Group
-"""
-
-import psycopg2
-import smtplib
-import email.Message
-import ConfigParser
-
-class LogChecker(object):
-       def __init__(self, cfg, db):
-               self.cfg = cfg
-               self.db = db
-               
-       def Check(self):
-               c = self.db.cursor()
-               c.execute("""
-       SELECT name,info,count(*) as num FROM aggregatorlog
-       INNER JOIN feeds ON feed=feeds.id 
-       WHERE success='f' AND ts > CURRENT_TIMESTAMP-'24 hours'::interval
-       GROUP BY name,info
-       HAVING count(*) > %s
-       ORDER BY num,name;
-""" % self.cfg.get('notify','minerrors'))
-
-               if c.rowcount > 0:
-                       s = """
-One or more of the blogs fetched in the past 24 hours caused an error
-as listed below.
-
-"""
-                       last = ""
-                       for name,info,num in c:
-                               s += "(%3s times) %s (%s)\n" % (num, name, info)
-                       
-                       s += "\n\n"
-
-                       toAddr = self.cfg.get('notify','mailto')
-                       fromAddr = self.cfg.get('notify','mailfrom')
-                       
-                       msg = email.Message.Message()
-                       msg['To'] = toAddr
-                       msg['From'] = fromAddr
-                       msg['Subject'] = 'Planet PostgreSQL error summary'
-                       msg.set_payload(s)
-                       
-                       
-                       smtp = smtplib.SMTP('127.0.0.1')
-                       smtp.sendmail(fromAddr, toAddr, msg.as_string())
-                       smtp.quit()
-               
-                       
-if __name__=="__main__":
-       c = ConfigParser.ConfigParser()
-       c.read('planet.ini')
-       LogChecker(c, psycopg2.connect(c.get('planet','db'))).Check()
-