X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fporterbox%2Ffiles%2Fmail-big-homedirs;h=98774fe8edcd8de6f666e438606b2d228f60e5fe;hb=4d66e9a53796fcbfd8a006bab04176650eab236b;hp=43dfe9167d51ceb95887f80a04f5863558b2b283;hpb=235050824e1853e6fdfb4070140651cf3c49649e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/porterbox/files/mail-big-homedirs b/modules/porterbox/files/mail-big-homedirs
index 43dfe9167..98774fe8e 100755
--- a/modules/porterbox/files/mail-big-homedirs
+++ b/modules/porterbox/files/mail-big-homedirs
@@ -35,7 +35,6 @@ from optparse import OptionParser
 import os.path
 import platform
 import pwd
-import socket
 import subprocess
 import struct
 import time
@@ -195,11 +194,20 @@ class HomedirReminder(object):
 
   def run(self):
     current_time = time.time()
+    conn = None
     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': self.homedir_sizes,
-        'host': socket.gethostname()
+        'data': data,
+        'host': platform.node(),
       }
       conn = Connection(conf=mq_conf)
       conn.topic_send(config.topic,
@@ -207,7 +215,7 @@ class HomedirReminder(object):
                       exchange_name=config.exchange,
                       timeout=5)
     except Exception, e:
-      LOG.error("Error sending: %s" % e)
+      logging.error("Error sending: %s" % e)
     finally:
       if conn:
         conn.close()