%security gets to update their static component

[dsa-puppet.git] / modules / porterbox / files / mail-big-homedirs

diff --git a/modules/porterbox/files/mail-big-homedirs b/modules/porterbox/files/mail-big-homedirs
index 8b1d3cec0216b5210f6bf66b033594d3b380bc74..98774fe8edcd8de6f666e438606b2d228f60e5fe 100755 (executable)
--- a/modules/porterbox/files/mail-big-homedirs
+++ b/modules/porterbox/files/mail-big-homedirs
@@ -194,10 +194,19 @@ 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,
+        'data': data,
         'host': platform.node(),
       }
       conn = Connection(conf=mq_conf)
@@ -206,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()