From a88fb52b8d519bd4bb4d2cdcb02bbe379a36693a Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Wed, 22 Apr 2015 16:07:15 +0200 Subject: [PATCH] Process list: TIME+: highlight hours (for long running processes >= 1h) --- glances/outputs/glances_curses.py | 3 +++ glances/plugins/glances_plugin.py | 1 + glances/plugins/glances_processlist.py | 9 +++++---- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/glances/outputs/glances_curses.py b/glances/outputs/glances_curses.py index 3d1a4fb0..af6c5a89 100644 --- a/glances/outputs/glances_curses.py +++ b/glances/outputs/glances_curses.py @@ -128,6 +128,7 @@ class _GlancesCurses(object): self.no_color = curses.color_pair(1) self.default_color = curses.color_pair(3) | A_BOLD self.nice_color = curses.color_pair(9) | A_BOLD + self.cpu_time_color = curses.color_pair(9) | A_BOLD self.ifCAREFUL_color = curses.color_pair(4) | A_BOLD self.ifWARNING_color = curses.color_pair(5) | A_BOLD self.ifCRITICAL_color = curses.color_pair(2) | A_BOLD @@ -141,6 +142,7 @@ class _GlancesCurses(object): self.no_color = curses.A_NORMAL self.default_color = curses.A_NORMAL self.nice_color = A_BOLD + self.cpu_time_color = A_BOLD self.ifCAREFUL_color = curses.A_UNDERLINE self.ifWARNING_color = A_BOLD self.ifCRITICAL_color = curses.A_REVERSE @@ -162,6 +164,7 @@ class _GlancesCurses(object): 'PROCESS': self.default_color2, 'STATUS': self.default_color2, 'NICE': self.nice_color, + 'CPU_TIME': self.cpu_time_color, 'CAREFUL': self.ifCAREFUL_color2, 'WARNING': self.ifWARNING_color2, 'CRITICAL': self.ifCRITICAL_color2, diff --git a/glances/plugins/glances_plugin.py b/glances/plugins/glances_plugin.py index ffd4b85b..73c68c75 100644 --- a/glances/plugins/glances_plugin.py +++ b/glances/plugins/glances_plugin.py @@ -553,6 +553,7 @@ class GlancesPlugin(object): PROCESS: for process name STATUS: for process status NICE: for process niceness + CPU_TIME: for process cpu time OK: Value is OK and non logged OK_LOG: Value is OK and logged CAREFUL: Value is CAREFUL and non logged diff --git a/glances/plugins/glances_processlist.py b/glances/plugins/glances_processlist.py index 3f49f206..dbdf4ced 100644 --- a/glances/plugins/glances_processlist.py +++ b/glances/plugins/glances_processlist.py @@ -247,12 +247,13 @@ class Plugin(GlancesPlugin): else: hours, minutes, seconds, microseconds = convert_timedelta(delta) if hours: - msg = '{0}h{1}:{2}'.format(hours, minutes, seconds) + msg = '{0:>4}h'.format(hours) + ret.append(self.curse_add_line(msg, decoration='CPU_TIME', optional=True)) + msg = '{0}:{1}'.format(minutes, seconds) else: - msg = '{0}:{1}.{2}'.format(minutes, seconds, microseconds) + msg = '{0:>4}:{1}.{2}'.format(minutes, seconds, microseconds) else: - msg = '?' - msg = '{0:>10}'.format(msg) + msg = '{0:>10}'.format('?') ret.append(self.curse_add_line(msg, optional=True)) # IO read/write if 'io_counters' in p: