projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
only wheezy and squeeze on ia64
[mirror/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
43dfe91
..
4211805
100755
(executable)
--- 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 os.path
import platform
import pwd
-import socket
import subprocess
import struct
import time
import subprocess
import struct
import time
@@
-195,11
+194,20
@@
class HomedirReminder(object):
def run(self):
current_time = time.time()
def run(self):
current_time = time.time()
+ conn = None
try:
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,
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,
}
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:
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()
finally:
if conn:
conn.close()
@@
-217,7
+225,7
@@
class HomedirReminder(object):
realname = pwd.getpwnam(username).pw_gecos.decode('utf-8').split(',', 1)[0]
except:
realname = username
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(),
days_ago = int( (current_time - lastlog_time) / 3600 / 24 )
kwargs = {
'hostname': platform.node(),