From a60f0b8b09d6ffe44efec5c9bc08eafe4b59c242 Mon Sep 17 00:00:00 2001 From: Marcin Lulek Date: Mon, 26 Aug 2019 16:58:08 +0200 Subject: [PATCH] summary-snapshot: fix formatting of snapshot + code cleanup. --- rhodecode/lib/system_info.py | 3 ++- .../templates/admin/settings/settings_system_snapshot.mako | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/rhodecode/lib/system_info.py b/rhodecode/lib/system_info.py index 0084bddb..4ce9b850 100644 --- a/rhodecode/lib/system_info.py +++ b/rhodecode/lib/system_info.py @@ -90,6 +90,7 @@ def get_cert_path(ini_path): return default + class SysInfoRes(object): def __init__(self, value, state=None, human_value=None): self.value = value @@ -187,7 +188,7 @@ def ulimit_info(): ('open files', get_resource(resource.RLIMIT_NOFILE)), ]) - text = ', '.join('{}:{}'.format(k,v) for k,v in data.items()) + text = ', '.join('{}:{}'.format(k, v) for k, v in data.items()) value = { 'limits': data, diff --git a/rhodecode/templates/admin/settings/settings_system_snapshot.mako b/rhodecode/templates/admin/settings/settings_system_snapshot.mako index 6aeba92d..cd74d20b 100644 --- a/rhodecode/templates/admin/settings/settings_system_snapshot.mako +++ b/rhodecode/templates/admin/settings/settings_system_snapshot.mako @@ -4,9 +4,9 @@ SYSTEM INFO ----------- % for dt, dd, warn in c.data_items: -${'{:<60}'.format(dt.lower().replace(' ', '_'))}${': '+dd if dt else ''} +${'{:<60}'.format(dt.lower().replace(' ', '_'))}${': {}'.format(dd if dt else '')} % if warn and warn['message']: - ALERT_${warn['type'].upper()} ${warn['message']} +${'{:<60}'.format('ALERT')} ${warn['type'].upper()} ${warn['message']} % endif % endfor