psutil exception handling in collect_vms

src/client.py

@@ -157,8 +157,8 @@ class Client:
         now = time.time()
         now = time.time()
         running_vms = []
         running_vms = []
 
 
-        for entry in psutil.get_process_list():
-            try:
+        try:
+            for entry in psutil.get_process_list():
                 if entry.name() in ('kvm', 'qemu-system-x86_64'):
                 if entry.name() in ('kvm', 'qemu-system-x86_64'):
                     parser = argparse.ArgumentParser()
                     parser = argparse.ArgumentParser()
                     parser.add_argument('-name')
                     parser.add_argument('-name')
@@ -191,8 +191,8 @@ class Client:
                     else: 
                     else: 
                         logger.warning('Pid: %d args.name is empty?: %s %s', entry.pid, entry.name(), entry.cmdline())
                         logger.warning('Pid: %d args.name is empty?: %s %s', entry.pid, entry.name(), entry.cmdline())
 
 
-            except psutil.NoSuchProcess, TypeError:
-                logger.warning('Process %d lost. Entry: %s', entry.pid, entry.cmdline()[1:])
+        except (psutil.NoSuchProcess, TypeError):
+            logger.warning('Process %d lost. Entry: %s', entry.pid, entry.cmdline()[0:])
 
 
         interfaces = psutil.network_io_counters(pernic=True)
         interfaces = psutil.network_io_counters(pernic=True)
         for interface, data in interfaces.iteritems():
         for interface, data in interfaces.iteritems():