X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fporterbox%2Ffiles%2Fmail-big-homedirs;h=d5277aef41e66ca190c65f973d86120b447f2015;hb=ca7c18007c9f3f380dbf71841e97204eb90bb4ca;hp=4fd1ba477359f28b50e7f2168d6e6b22d496c8c3;hpb=3c85d7d69fa36e8f8229008b8e899c2cf15f08aa;p=mirror%2Fdsa-puppet.git

diff --git a/modules/porterbox/files/mail-big-homedirs b/modules/porterbox/files/mail-big-homedirs
index 4fd1ba477..d5277aef4 100755
--- a/modules/porterbox/files/mail-big-homedirs
+++ b/modules/porterbox/files/mail-big-homedirs
@@ -3,7 +3,7 @@
 # Send email reminders to users having sizable homedirs.
 ##
 # Copyright (c) 2013 Philipp Kern <pkern@debian.org>
-# Copyright (c) 2013 Peter Palfrader <peter@palfrader.org>
+# Copyright (c) 2013, 2014 Peter Palfrader <peter@palfrader.org>
 # Copyright (c) 2013 Luca Filipozzi <lfilipoz@debian.org>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -25,10 +25,13 @@
 # THE SOFTWARE.
 
 from collections import defaultdict
+from dsa_mq.connection import Connection
+from dsa_mq.config import Config
 import email
 import email.mime.text
 import glob
 import logging
+from optparse import OptionParser
 import os.path
 import platform
 import pwd
@@ -40,26 +43,42 @@ import StringIO
 # avoid base64 encoding for utf-8
 email.charset.add_charset('utf-8', email.charset.SHORTEST, email.charset.QP)
 
-DRYRUN = False
-
-if DRYRUN:
+parser = OptionParser()
+parser.add_option("-D", "--dryrun",
+                  action="store_true", default=False,
+                  help="Dry run mode")
+
+parser.add_option("-d", "--debug",
+                  action="store_true", default=False,
+                  help="Enable debug output")
+
+(options, args) = parser.parse_args()
+options.section = 'dsa-homedirs'
+options.config = '/etc/dsa/pubsub.conf'
+config = Config(options)
+mq_conf  = {
+  'rabbit_userid': config.username,
+  'rabbit_password': config.password,
+  'rabbit_virtual_host': config.vhost,
+  'rabbit_hosts': ['pubsub02.debian.org', 'pubsub01.debian.org'],
+  'use_ssl': False
+}
+
+if options.dryrun:
   SENDMAIL_COMMAND = ['/bin/cat']
-else:
-  SENDMAIL_COMMAND = ['/usr/sbin/sendmail', '-t', '-oi']
-
-if DRYRUN:
   RM_COMMAND = ['/bin/echo', 'Would remove']
 else:
+  SENDMAIL_COMMAND = ['/usr/sbin/sendmail', '-t', '-oi']
   RM_COMMAND = ['/bin/rm', '-rf']
 
 CRITERIA = [
-    { 'size': 10240,  'notifyafter':  5}, #, 'deleteafter':  40 },
-    { 'size':  1024,  'notifyafter': 10}, #, 'deleteafter':  50 },
-    { 'size':   100,  'notifyafter': 30}, #, 'deleteafter':  90 },
-    { 'size':    20,  'notifyafter': 90}, #, 'deleteafter': 150 },
-    { 'size':     5,                        'deleteafter': 700 }
+    { 'size': 10240,  'notifyafter':  5, 'deleteafter':  40 },
+    { 'size':  1024,  'notifyafter': 10, 'deleteafter':  50 },
+    { 'size':   100,  'notifyafter': 30, 'deleteafter':  90 },
+    { 'size':    20,  'notifyafter': 90, 'deleteafter': 150 },
+    { 'size':     5,                     'deleteafter': 700 }
   ]
-EXCLUDED_USERNAMES = ['lost+found']
+EXCLUDED_USERNAMES = ['lost+found', 'debian']
 MAIL_FROM = 'debian-admin (via Cron) <bulk@admin.debian.org>'
 MAIL_TO = '{username}@{hostname}.debian.org'
 MAIL_CC = 'debian-admin (bulk sink) <bulk@admin.debian.org>'
@@ -167,7 +186,6 @@ class HomedirReminder(object):
   def remove(self, **kwargs):
     try:
       pwinfo = pwd.getpwnam(kwargs.get('username'))
-      return
     except KeyError:
       return
 
@@ -176,6 +194,30 @@ class HomedirReminder(object):
 
   def run(self):
     current_time = time.time()
+    try:
+      data = {}
+      for user in set(self.homedir_sizes.keys()) +
+                  set(self.lastlog_times.keys()):
+        data[user] = {
+          'homedir': self.homedir_sizes.get(user, 0),
+          'lastlog': self.lastlog_times.get(user, 0),
+        }
+
+      msg = {
+        'timestamp': current_time,
+        'data': data,
+        'host': platform.node(),
+      }
+      conn = Connection(conf=mq_conf)
+      conn.topic_send(config.topic,
+                      msg,
+                      exchange_name=config.exchange,
+                      timeout=5)
+    except Exception, e:
+      LOG.error("Error sending: %s" % e)
+    finally:
+      if conn:
+        conn.close()
 
     for username, homedir_size in self.homedir_sizes.iteritems():
       try:
@@ -206,7 +248,8 @@ class HomedirReminder(object):
         self.notify(**kwargs)
 
 if __name__ == '__main__':
-  logging.basicConfig()
-  # DEBUG for debugging, ERROR for production.
-  logging.getLogger().setLevel(logging.ERROR)
+  lvl = logging.ERROR
+  if options.debug:
+    lvl = logging.DEBUG
+  logging.basicConfig(level=lvl)
   HomedirReminder().run()