X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fporterbox%2Ffiles%2Fmail-big-homedirs;h=4211805532d91a25e06f4f6db404eb60edf06071;hb=04e6fc556aa29ce73e0e6824e80d0fc9a7c778ba;hp=d5277aef41e66ca190c65f973d86120b447f2015;hpb=ca7c18007c9f3f380dbf71841e97204eb90bb4ca;p=dsa-puppet.git

diff --git a/modules/porterbox/files/mail-big-homedirs b/modules/porterbox/files/mail-big-homedirs
index d5277aef..42118055 100755
--- a/modules/porterbox/files/mail-big-homedirs
+++ b/modules/porterbox/files/mail-big-homedirs
@@ -194,9 +194,10 @@ class HomedirReminder(object):
 
   def run(self):
     current_time = time.time()
+    conn = None
     try:
       data = {}
-      for user in set(self.homedir_sizes.keys()) +
+      for user in set(self.homedir_sizes.keys()) | \
                   set(self.lastlog_times.keys()):
         data[user] = {
           'homedir': self.homedir_sizes.get(user, 0),
@@ -214,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()
@@ -224,7 +225,7 @@ class HomedirReminder(object):
         realname = pwd.getpwnam(username).pw_gecos.decode('utf-8').split(',', 1)[0]
       except:
         realname = username
-      lastlog_time = self.lastlog_times[username]
+      lastlog_time = self.lastlog_times.get(username, 0)
       days_ago = int( (current_time - lastlog_time) / 3600 / 24 )
       kwargs = {
           'hostname': platform.node(),