diff options
Diffstat (limited to 'glances/plugins/glances_quicklook.py')
-rw-r--r-- | glances/plugins/glances_quicklook.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/glances/plugins/glances_quicklook.py b/glances/plugins/glances_quicklook.py index e49628e4..babca182 100644 --- a/glances/plugins/glances_quicklook.py +++ b/glances/plugins/glances_quicklook.py @@ -81,7 +81,11 @@ class Plugin(GlancesPlugin): stats['percpu'] = cpu_percent.get(percpu=True) # Use the psutil lib for the memory (virtual and swap) stats['mem'] = psutil.virtual_memory().percent - stats['swap'] = psutil.swap_memory().percent + try: + stats['swap'] = psutil.swap_memory().percent + except RuntimeError: + # Correct issue in Illumos OS (see #1767) + stats['swap'] = None elif self.input_method == 'snmp': # Not available pass @@ -99,8 +103,12 @@ class Plugin(GlancesPlugin): stats['cpu_name'] = cpu_info.get('brand', 'CPU') if 'hz_actual_raw' in cpu_info: stats['cpu_hz_current'] = cpu_info['hz_actual_raw'][0] + elif 'hz_actual' in cpu_info: + stats['cpu_hz_current'] = cpu_info['hz_actual'][0] if 'hz_advertised_raw' in cpu_info: stats['cpu_hz'] = cpu_info['hz_advertised_raw'][0] + elif 'hz_advertised' in cpu_info: + stats['cpu_hz'] = cpu_info['hz_advertised'][0] # Update the stats self.stats = stats |