diff --git a/glances/monitor_list.py b/glances/monitor_list.py index 69766652..0a0bc70a 100644 --- a/glances/monitor_list.py +++ b/glances/monitor_list.py @@ -130,6 +130,11 @@ class MonitorList(object): monitoredlist = [p for p in processlist if re.search(self.regex(i), p['cmdline']) is not None] self.__monitor_list[i]['count'] = len(monitoredlist) + # Always get processes CPU and MEM + self.__monitor_list[i]['default_result'] = 'CPU: {0:.1f}% | MEM: {1:.1f}%'.format( + sum([p['cpu_percent'] for p in monitoredlist]), + sum([p['memory_percent'] for p in monitoredlist])) + if self.command(i) is not None: # Execute the user command line try: @@ -148,9 +153,7 @@ class MonitorList(object): if self.command(i) is None or self.__monitor_list[i]['result'] == '': # If there is no command specified in the conf file # then display CPU and MEM % - self.__monitor_list[i]['result'] = 'CPU: {0:.1f}% | MEM: {1:.1f}%'.format( - sum([p['cpu_percent'] for p in monitoredlist]), - sum([p['memory_percent'] for p in monitoredlist])) + self.__monitor_list[i]['result'] = self.__monitor_list[i]['default_result'] return self.__monitor_list diff --git a/glances/plugins/glances_monitor.py b/glances/plugins/glances_monitor.py index 8fe1bf46..71d25acc 100644 --- a/glances/plugins/glances_monitor.py +++ b/glances/plugins/glances_monitor.py @@ -102,8 +102,8 @@ class Plugin(GlancesPlugin): try: msg = u(m['result']) if m['count'] >= 1 else '' except UnicodeEncodeError: - # Hack if return message contain accent letter (non UTF-8 compliant) - msg = '' + # Hack if return message contains non UTF-8 compliant char + msg = u(m['default_result']) if m['count'] >= 1 else '' ret.append(self.curse_add_line(msg, optional=True, splittable=True)) ret.append(self.curse_new_line())