summaryrefslogtreecommitdiffstats
path: root/glances
diff options
context:
space:
mode:
authorNicolas Hennion <nicolas.hennion@thalesaleniaspace.com>2021-05-26 13:57:31 +0200
committerNicolas Hennion <nicolas.hennion@thalesaleniaspace.com>2021-05-26 13:57:31 +0200
commit487a758edf2c96e54a62dc65424bb1bf1fc5270d (patch)
tree04c46b80312262bec234aeeddf64162f20c12d7b /glances
parentca246a1ae50d4807c559ffb4581f57cc85f0adc4 (diff)
Update GraphFlame
Diffstat (limited to 'glances')
-rw-r--r--glances/config.py2
-rw-r--r--glances/processes.py17
2 files changed, 12 insertions, 7 deletions
diff --git a/glances/config.py b/glances/config.py
index e8053019..98212d3a 100644
--- a/glances/config.py
+++ b/glances/config.py
@@ -143,7 +143,7 @@ class Config(object):
def read(self):
"""Read the config file, if it exists. Using defaults otherwise."""
for config_file in self.config_file_paths():
- logger.info('Search glances.conf file in {}'.format(config_file))
+ logger.debug('Search glances.conf file in {}'.format(config_file))
if os.path.exists(config_file):
try:
with open(config_file, encoding='utf-8') as f:
diff --git a/glances/processes.py b/glances/processes.py
index 6dd34d0e..71679224 100644
--- a/glances/processes.py
+++ b/glances/processes.py
@@ -391,17 +391,22 @@ class GlancesProcesses(object):
# Manage cached information
if is_cached:
- # Add cached values
+ # Grab cached values (in case of a new incoming process)
if proc['pid'] not in self.processlist_cache:
- self.processlist_cache[proc['pid']]= psutil.Process(pid=proc['pid']).as_dict(attrs=cached_attrs,
- ad_value=None)
- for cached in cached_attrs:
- proc[cached] = self.processlist_cache[proc['pid']][cached]
+ try:
+ self.processlist_cache[proc['pid']]= psutil.Process(pid=proc['pid']).as_dict(attrs=cached_attrs,
+ ad_value=None)
+ except psutil.NoSuchProcess:
+ pass
+ # Add cached value to current stat
+ try:
+ proc.update(self.processlist_cache[proc['pid']])
+ except KeyError:
+ pass
else:
# Save values to cache
self.processlist_cache[proc['pid']] = { cached: proc[cached] for cached in cached_attrs }
-
# Compute the maximum value for keys in self._max_values_list: CPU, MEM
# Usefull to highlight the processes with maximum values
for k in self._max_values_list: