##// END OF EJS Templates
ini: set 'debug' only in one place...
ini: set 'debug' only in one place In Pylons-based Kallithea, the 'debug' option was set first in [DEFAULTS] and then overridden with 'set debug = X' in [app:main]. Even when the value under [DEFAULTS] was commented out, the use of the 'set' keyword (providing override semantics) was required, because a default value for the global 'debug' was provided in the framework. The presence of these two debug assignments is confusing. Moreover, TurboGears2 makes the situation more easy and does not expect 'debug' to be in [DEFAULTS] nor does it provide a default at that level. As a result, we can simple use 'debug = X' under [app:main]. Additionally, clarify the Big Fat Warning: the wording 'the line below' is ambiguous and could be misunderstood in an ini file that had previously been changed.

File last commit:

r6526:fc6b1b0e default
r6526:fc6b1b0e default
Show More
generate-ini.py
168 lines | 6.4 KiB | text/x-python | PythonLexer
Mads Kiilerich
ini: add scripts/generate-ini.py for generating all .ini files from template.ini.mako...
r5536 #!/usr/bin/env python2
"""
Mads Kiilerich
gearbox: make a make-config sub-command available again...
r6510 Based on kallithea/lib/paster_commands/template.ini.mako, generate
Mads Kiilerich
ini: add scripts/generate-ini.py for generating all .ini files from template.ini.mako...
r5536 development.ini
kallithea/tests/test.ini
"""
import re
Mads Kiilerich
gearbox: make a make-config sub-command available again...
r6510 makofile = 'kallithea/lib/paster_commands/template.ini.mako'
Mads Kiilerich
ini: add scripts/generate-ini.py for generating all .ini files from template.ini.mako...
r5536
# the mako conditionals used in all other ini files and templates
selected_mako_conditionals = set([
"database_engine == 'sqlite'",
"http_server == 'waitress'",
Mads Kiilerich
Merge stable
r6340 "error_aggregation_service == 'appenlight'",
Mads Kiilerich
ini: add scripts/generate-ini.py for generating all .ini files from template.ini.mako...
r5536 "error_aggregation_service == 'sentry'",
])
# the mako variables used in all other ini files and templates
mako_variable_values = {
'host': '127.0.0.1',
'port': '5000',
'here': '%(here)s',
'uuid()': '${app_instance_uuid}',
}
# files to be generated from the mako template
ini_files = [
('kallithea/tests/test.ini',
'''
Kallithea - config for tests:
initial_repo_scan = true
sqlalchemy and kallithea_test.sqlite
custom logging
The %(here)s variable will be replaced with the parent directory of this file
''',
{
'[server:main]': {
'port': '4999',
},
'[app:main]': {
'initial_repo_scan': 'true',
'app_instance_uuid': 'test',
'show_revision_number': 'true',
'beaker.cache.sql_cache_short.expire': '1',
'beaker.session.secret': '{74e0cd75-b339-478b-b129-07dd221def1f}',
Mads Kiilerich
tests: move test data to top level 'data' folder - make grepping in kallithea/ easier...
r6001 'cache_dir': '%(here)s/../../data/test/cache',
'index_dir': '%(here)s/../../data/test/index',
'archive_cache_dir': '%(here)s/../../data/test/tarballcache',
'beaker.cache.data_dir': '%(here)s/../../data/test/cache/data',
'beaker.cache.lock_dir': '%(here)s/../../data/test/cache/lock',
Thomas De Schampheleire
Turbogears2 migration: use sqlalchemy.url iso sqlalchemy.db1.url...
r6177 'sqlalchemy.url': 'sqlite:///%(here)s/kallithea_test.sqlite',
Mads Kiilerich
ini: add scripts/generate-ini.py for generating all .ini files from template.ini.mako...
r5536 },
Thomas De Schampheleire
test.ini: align some logging-related settings with development.ini...
r6108 '[handler_console]': {
Mads Kiilerich
ini: add scripts/generate-ini.py for generating all .ini files from template.ini.mako...
r5536 'level': 'DEBUG',
Thomas De Schampheleire
test.ini: align some logging-related settings with development.ini...
r6108 'formatter': 'color_formatter',
Mads Kiilerich
ini: add scripts/generate-ini.py for generating all .ini files from template.ini.mako...
r5536 },
Thomas De Schampheleire
test.ini: align some logging-related settings with development.ini...
r6108 # The 'handler_console_sql' block is very similar to the one in
# development.ini, but without the explicit 'level=DEBUG' setting:
# it causes duplicate sqlalchemy debug logs, one through
# handler_console_sql and another through another path.
'[handler_console_sql]': {
'formatter': 'color_formatter_sql',
Mads Kiilerich
ini: add scripts/generate-ini.py for generating all .ini files from template.ini.mako...
r5536 },
},
),
('development.ini',
'''
Kallithea - Development config:
listening on *:5000
sqlite and kallithea.db
initial_repo_scan = true
Thomas De Schampheleire
ini: set 'debug' only in one place...
r6526 debug = true
Mads Kiilerich
ini: add scripts/generate-ini.py for generating all .ini files from template.ini.mako...
r5536 verbose and colorful logging
The %(here)s variable will be replaced with the parent directory of this file
''',
{
'[server:main]': {
'host': '0.0.0.0',
},
'[app:main]': {
'initial_repo_scan': 'true',
Thomas De Schampheleire
ini: set 'debug' only in one place...
r6526 'debug': 'true',
Mads Kiilerich
ini: add scripts/generate-ini.py for generating all .ini files from template.ini.mako...
r5536 'app_instance_uuid': 'development-not-secret',
'beaker.session.secret': 'development-not-secret',
},
'[handler_console]': {
'level': 'DEBUG',
'formatter': 'color_formatter',
},
'[handler_console_sql]': {
'level': 'DEBUG',
'formatter': 'color_formatter_sql',
},
},
),
]
def main():
# make sure all mako lines starting with '#' (the '##' comments) are marked up as <text>
print 'reading:', makofile
mako_org = file(makofile).read()
mako_no_text_markup = re.sub(r'</?%text>', '', mako_org)
mako_marked_up = re.sub(r'\n(##.*)', r'\n<%text>\1</%text>', mako_no_text_markup, flags=re.MULTILINE)
if mako_marked_up != mako_org:
print 'writing:', makofile
file(makofile, 'w').write(mako_marked_up)
# select the right mako conditionals for the other less sophisticated formats
def sub_conditionals(m):
"""given a %if...%endif match, replace with just the selected
conditional sections enabled and the rest as comments
"""
conditional_lines = m.group(1)
def sub_conditional(m):
"""given a conditional and the corresponding lines, return them raw
or commented out, based on whether conditional is selected
"""
criteria, lines = m.groups()
if criteria not in selected_mako_conditionals:
lines = '\n'.join((l if not l or l.startswith('#') else '#' + l) for l in lines.split('\n'))
return lines
conditional_lines = re.sub(r'^%(?:el)?if (.*):\n((?:^[^%\n].*\n|\n)*)',
sub_conditional, conditional_lines, flags=re.MULTILINE)
return conditional_lines
mako_no_conditionals = re.sub(r'^(%if .*\n(?:[^%\n].*\n|%elif .*\n|\n)*)%endif\n',
sub_conditionals, mako_no_text_markup, flags=re.MULTILINE)
# expand mako variables
def pyrepl(m):
return mako_variable_values.get(m.group(1), m.group(0))
mako_no_variables = re.sub(r'\${([^}]*)}', pyrepl, mako_no_conditionals)
# remove utf-8 coding header
base_ini = re.sub(r'^## -\*- coding: utf-8 -\*-\n', '', mako_no_variables)
# create ini files
for fn, desc, settings in ini_files:
print 'updating:', fn
ini_lines = re.sub(
'# Kallithea - config file generated with kallithea-config *#\n',
''.join('# %-77s#\n' % l.strip() for l in desc.strip().split('\n')),
base_ini)
def process_section(m):
"""process a ini section, replacing values as necessary"""
sectionname, lines = m.groups()
if sectionname in settings:
section_settings = settings[sectionname]
def process_line(m):
"""process a section line and update value if necessary"""
setting, value = m.groups()
line = m.group(0)
if setting in section_settings:
line = '%s = %s' % (setting, section_settings[setting])
if '$' not in value:
line = '#%s = %s\n%s' % (setting, value, line)
return line.rstrip()
lines = re.sub(r'^([^#\n].*) = ?(.*)', process_line, lines, flags=re.MULTILINE)
return sectionname + '\n' + lines
ini_lines = re.sub(r'^(\[.*\])\n((?:(?:[^[\n].*)?\n)*)', process_section, ini_lines, flags=re.MULTILINE)
file(fn, 'w').write(ini_lines)
if __name__ == '__main__':
main()