From 2f19673dc49d92f7d1644ea415cf8b0e76fa0a84 Mon Sep 17 00:00:00 2001 From: Daniel Dourvaris Date: Thu, 26 Sep 2019 11:20:03 +0200 Subject: [PATCH] system-info: expose data about vcsserver. --- rhodecode/apps/admin/views/system_info.py | 4 ++++ rhodecode/lib/system_info.py | 19 +++++++++++++++++++ .../admin/settings/settings_system.mako | 14 ++++++++++++++ 3 files changed, 37 insertions(+) diff --git a/rhodecode/apps/admin/views/system_info.py b/rhodecode/apps/admin/views/system_info.py index c3d45c5a..953755e6 100644 --- a/rhodecode/apps/admin/views/system_info.py +++ b/rhodecode/apps/admin/views/system_info.py @@ -155,6 +155,10 @@ class AdminSystemInfoSettingsView(BaseAppView): ] + c.vcsserver_data_items = [ + (k, v) for k,v in (val('vcs_server_config') or {}).items() + ] + if snapshot: if c.allowed_to_snapshot: c.data_items.pop(0) # remove server info diff --git a/rhodecode/lib/system_info.py b/rhodecode/lib/system_info.py index 4ce9b850..54420d8c 100644 --- a/rhodecode/lib/system_info.py +++ b/rhodecode/lib/system_info.py @@ -594,6 +594,23 @@ def vcs_server(): return SysInfoRes(value=value, state=state, human_value=human_value) +def vcs_server_config(): + from rhodecode.lib.vcs.backends import get_vcsserver_service_data + state = STATE_OK_DEFAULT + + value = {} + try: + data = get_vcsserver_service_data() + value = data['app_config'] + except Exception as e: + state = {'message': str(e), 'type': STATE_ERR} + + human_value = value.copy() + human_value['text'] = 'VCS Server config' + + return SysInfoRes(value=value, state=state, human_value=human_value) + + def rhodecode_app_info(): import rhodecode edition = rhodecode.CONFIG.get('rhodecode.edition') @@ -771,6 +788,8 @@ def get_system_info(environ): 'vcs_backends': SysInfo(vcs_backends)(), 'vcs_server': SysInfo(vcs_server)(), + 'vcs_server_config': SysInfo(vcs_server_config)(), + 'git': SysInfo(git_info)(), 'hg': SysInfo(hg_info)(), 'svn': SysInfo(svn_info)(), diff --git a/rhodecode/templates/admin/settings/settings_system.mako b/rhodecode/templates/admin/settings/settings_system.mako index 89117e3f..bff52eaa 100644 --- a/rhodecode/templates/admin/settings/settings_system.mako +++ b/rhodecode/templates/admin/settings/settings_system.mako @@ -27,6 +27,20 @@ +
+
+

${_('VCS Server')}

+
+
+
+ % for dt, dd in c.vcsserver_data_items: +
${dt}${':' if dt else '---'}
+
${dd}${'' if dt else '---'}
+ % endfor +
+
+
+

${_('Python Packages')}