X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fporterbox%2Ffiles%2Fmail-big-homedirs;h=f5225b5c8982fc61666aa01d1fb68a50b77ff752;hb=4f011cbc16fddc4f475bf40ae11e3407bd4ac1dc;hp=4211805532d91a25e06f4f6db404eb60edf06071;hpb=5dcca55f481da5b65e989a2d5712325bd32fe736;p=mirror%2Fdsa-puppet.git

diff --git a/modules/porterbox/files/mail-big-homedirs b/modules/porterbox/files/mail-big-homedirs
index 421180553..f5225b5c8 100755
--- a/modules/porterbox/files/mail-big-homedirs
+++ b/modules/porterbox/files/mail-big-homedirs
@@ -55,14 +55,17 @@ parser.add_option("-d", "--debug",
 (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 os.access(options.config, os.R_OK):
+  mq_config = Config(options)
+  mq_conf  = {
+    'rabbit_userid': mq_config.username,
+    'rabbit_password': mq_config.password,
+    'rabbit_virtual_host': mq_config.vhost,
+    'rabbit_hosts': ['pubsub02.debian.org', 'pubsub01.debian.org'],
+    'use_ssl': False
+  }
+else:
+  mq_config = None
 
 if options.dryrun:
   SENDMAIL_COMMAND = ['/bin/cat']
@@ -78,7 +81,7 @@ CRITERIA = [
     { 'size':    20,  'notifyafter': 90, 'deleteafter': 150 },
     { 'size':     5,                     'deleteafter': 700 }
   ]
-EXCLUDED_USERNAMES = ['lost+found', 'debian']
+EXCLUDED_USERNAMES = ['lost+found', 'debian', 'buildd', 'd-i']
 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>'
@@ -114,15 +117,31 @@ class SendmailError(Error):
   pass
 
 class LastlogTimes(dict):
-  LASTLOG_STRUCT = '=L32s256s'
+  LASTLOG_STRUCT_32 = '=L32s256s'
+  LASTLOG_STRUCT_64 = '=Q32s256s'
 
   def __init__(self):
-    record_size = struct.calcsize(self.LASTLOG_STRUCT)
+    record_size_32 = struct.calcsize(self.LASTLOG_STRUCT_32)
+    record_size_64 = struct.calcsize(self.LASTLOG_STRUCT_64)
+    # some 64bit arches have 32bit-compatible lastlog structures, others don't,
+    # in apparently incoherent ways, so hardcode a list...
+    if platform.machine() in ('aarch64', 's390x'):
+        self.LASTLOG_STRUCT = self.LASTLOG_STRUCT_64
+        record_size = record_size_64
+    else:
+        self.LASTLOG_STRUCT = self.LASTLOG_STRUCT_32
+        record_size = record_size_32
     with open('/var/log/lastlog', 'r') as fp:
       uid = -1 # there is one record per uid in lastlog
       for record in iter(lambda: fp.read(record_size), ''):
+        if len(record) != record_size:
+            raise RuntimeError('lastlog has unexpected size, read %d instead of %d'
+                               % (len(record), record_size))
         uid += 1 # so keep incrementing uid for each record read
         lastlog_time, _, _ = list(struct.unpack(self.LASTLOG_STRUCT, record))
+        if lastlog_time < 0:
+            raise RuntimeError('unexpected last login time %d for user %s'
+                               % (lastlog_time, pwd.getpwuid(uid).pw_name))
         try:
           self[pwd.getpwuid(uid).pw_name] = lastlog_time
         except KeyError:
@@ -204,16 +223,17 @@ class HomedirReminder(object):
           '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)
+      if mq_config is not None:
+        msg = {
+          'timestamp': current_time,
+          'data': data,
+          'host': platform.node(),
+        }
+        conn = Connection(conf=mq_conf)
+        conn.topic_send(mq_config.topic,
+                        msg,
+                        exchange_name=mq_config.exchange,
+                        timeout=5)
     except Exception, e:
       logging.error("Error sending: %s" % e)
     finally: