diff options
author | nicolargo <nicolas@nicolargo.com> | 2017-03-11 08:25:08 +0100 |
---|---|---|
committer | nicolargo <nicolas@nicolargo.com> | 2017-03-11 08:25:08 +0100 |
commit | 17d6318ed5ee94d43819c69d61d4ef1d0ffa1522 (patch) | |
tree | 8af00f74b153905f2be40d15ccb75e6ff5f71208 | |
parent | afb2f0de071f34344971a882dc4ff2e46f6eb099 (diff) |
Manage catch error on old PsUtil version
-rw-r--r-- | glances/processes.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/glances/processes.py b/glances/processes.py index 9467fe01..b231911e 100644 --- a/glances/processes.py +++ b/glances/processes.py @@ -29,6 +29,12 @@ from glances.logger import logger import psutil +# Workaround for old PsUtil version +if hasattr(psutil, 'WindowsError'): + PsUtilWindowsError = psutil.WindowsError +else: + PsUtilWindowsError = None + def is_kernel_thread(proc): """Return True if proc is a kernel thread, False instead.""" @@ -269,7 +275,7 @@ class GlancesProcesses(object): # Patch for issue #391 try: self.cmdline_cache[procstat['pid']] = proc.cmdline() - except (AttributeError, UnicodeDecodeError, psutil.AccessDenied, psutil.NoSuchProcess, psutil.WindowsError): + except (AttributeError, UnicodeDecodeError, psutil.AccessDenied, psutil.NoSuchProcess, PsUtilWindowsError): self.cmdline_cache[procstat['pid']] = "" procstat['cmdline'] = self.cmdline_cache[procstat['pid']] |