Show More
@@ -107,6 +107,8 b' class AdminSystemInfoSettingsView(AdminS' | |||||
107 | (_('RhodeCode Server IP'), val('server')['server_ip'], state('server')), |
|
107 | (_('RhodeCode Server IP'), val('server')['server_ip'], state('server')), | |
108 | (_('RhodeCode Server ID'), val('server')['server_id'], state('server')), |
|
108 | (_('RhodeCode Server ID'), val('server')['server_id'], state('server')), | |
109 | (_('RhodeCode Configuration'), val('rhodecode_config')['path'], state('rhodecode_config')), |
|
109 | (_('RhodeCode Configuration'), val('rhodecode_config')['path'], state('rhodecode_config')), | |
|
110 | (_('Workers'), val('rhodecode_config')['config']['server:main'].get('workers', '?'), state('rhodecode_config')), | |||
|
111 | (_('Worker Type'), val('rhodecode_config')['config']['server:main'].get('worker_class', 'sync'), state('rhodecode_config')), | |||
110 | ('', '', ''), # spacer |
|
112 | ('', '', ''), # spacer | |
111 |
|
113 | |||
112 | # Database |
|
114 | # Database |
@@ -520,9 +520,22 b' def rhodecode_app_info():' | |||||
520 |
|
520 | |||
521 | def rhodecode_config(): |
|
521 | def rhodecode_config(): | |
522 | import rhodecode |
|
522 | import rhodecode | |
|
523 | import ConfigParser | |||
523 | path = rhodecode.CONFIG.get('__file__') |
|
524 | path = rhodecode.CONFIG.get('__file__') | |
524 | rhodecode_ini_safe = rhodecode.CONFIG.copy() |
|
525 | rhodecode_ini_safe = rhodecode.CONFIG.copy() | |
525 |
|
526 | |||
|
527 | try: | |||
|
528 | config = ConfigParser.ConfigParser() | |||
|
529 | config.read(path) | |||
|
530 | parsed_ini = config | |||
|
531 | if parsed_ini.has_section('server:main'): | |||
|
532 | parsed_ini = dict(parsed_ini.items('server:main')) | |||
|
533 | except Exception: | |||
|
534 | log.exception('Failed to read .ini file for display') | |||
|
535 | parsed_ini = {} | |||
|
536 | ||||
|
537 | rhodecode_ini_safe['server:main'] = parsed_ini | |||
|
538 | ||||
526 | blacklist = [ |
|
539 | blacklist = [ | |
527 | 'rhodecode_license_key', |
|
540 | 'rhodecode_license_key', | |
528 | 'routes.map', |
|
541 | 'routes.map', |
General Comments 0
You need to be logged in to leave comments.
Login now