eximconf: more RBLs for the default set

[mirror/dsa-puppet.git] / modules / buildd / files / buildd-schroot-aptitude-kill

diff --git a/modules/buildd/files/buildd-schroot-aptitude-kill b/modules/buildd/files/buildd-schroot-aptitude-kill
index c73667a..c7bc36a 100755 (executable)
--- a/modules/buildd/files/buildd-schroot-aptitude-kill
+++ b/modules/buildd/files/buildd-schroot-aptitude-kill
@@ -34,15 +34,15 @@ except OSError, e:
        if e.errno == errno.ENOENT:
                sys.exit(0)
 
-total_mem = psutil.phymem_usage().total
+total_mem = psutil.virtual_memory().total
 cutoff_time = 60*10
 
 for p in psutil.process_iter():
        try:
-               if p.name != 'aptitude': continue
-               parent = p.parent
+               if p.name() != 'aptitude': continue
+               parent = p.parent()
                if parent is None: continue
-               if parent.name != 'schroot': continue
+               if parent.name() != 'schroot': continue
                #
                try:
                        rootdir = os.readlink('/proc/%d/root'%(p.pid,))
@@ -54,11 +54,9 @@ for p in psutil.process_iter():
                if not rootdir.startswith('/var/lib/schroot/mount'): continue
                #
                used = p.get_memory_info().vms
-               if used < total_mem: continue
-               #
                cputime = p.get_cpu_times().user
-               if cputime < cutoff_time: continue
+               if used < total_mem and cputime < cutoff_time: continue
                #
                p.kill()
-       except psutil.error.NoSuchProcess:
+       except psutil.NoSuchProcess:
                pass