mirror of
https://github.com/nicolargo/glances.git
synced 2025-01-03 15:15:02 +03:00
Merge branch 'issue1120' into develop
This commit is contained in:
commit
b3e20496e4
1
NEWS
1
NEWS
@ -15,6 +15,7 @@ Bugs corrected:
|
|||||||
* Potential memory leak in Windows WebUI (issue #1056)
|
* Potential memory leak in Windows WebUI (issue #1056)
|
||||||
* glances_network `OSError: [Errno 19] No such device` (issue #1106)
|
* glances_network `OSError: [Errno 19] No such device` (issue #1106)
|
||||||
* GPU plugin. <class 'TypeError'>: ... not JSON serializable"> (issue #1112)
|
* GPU plugin. <class 'TypeError'>: ... not JSON serializable"> (issue #1112)
|
||||||
|
* PermissionError on macOS (issue #1120)
|
||||||
|
|
||||||
Installation:
|
Installation:
|
||||||
|
|
||||||
|
@ -240,8 +240,9 @@ class GlancesProcesses(object):
|
|||||||
procstat.update(proc.as_dict(
|
procstat.update(proc.as_dict(
|
||||||
attrs=['name', 'cpu_times', 'status', 'ppid'],
|
attrs=['name', 'cpu_times', 'status', 'ppid'],
|
||||||
ad_value=''))
|
ad_value=''))
|
||||||
except psutil.NoSuchProcess:
|
except (psutil.NoSuchProcess, psutil.AccessDenied):
|
||||||
# Try/catch for issue #432 (process no longer exist)
|
# Try/catch for issue #432 (process no longer exist)
|
||||||
|
# Try/catch for issue #1120 (only see on Macos)
|
||||||
return None
|
return None
|
||||||
else:
|
else:
|
||||||
procstat['status'] = str(procstat['status'])[:1].upper()
|
procstat['status'] = str(procstat['status'])[:1].upper()
|
||||||
@ -250,7 +251,7 @@ class GlancesProcesses(object):
|
|||||||
procstat.update(proc.as_dict(
|
procstat.update(proc.as_dict(
|
||||||
attrs=['username', 'cpu_percent', 'memory_percent'],
|
attrs=['username', 'cpu_percent', 'memory_percent'],
|
||||||
ad_value=''))
|
ad_value=''))
|
||||||
except psutil.NoSuchProcess:
|
except (psutil.NoSuchProcess, psutil.AccessDenied):
|
||||||
# Try/catch for issue #432 (process no longer exist)
|
# Try/catch for issue #432 (process no longer exist)
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user