##// END OF EJS Templates
code: small fixes/whitespace/logging
super-admin -
r4872:72f064ef default
parent child Browse files
Show More
@@ -63,6 +63,7 b' def generate_mod_dav_svn_config(registry'
63 trigger(ModDavSvnConfigChange(), registry)
63 trigger(ModDavSvnConfigChange(), registry)
64 return file_path
64 return file_path
65
65
66
66 def _render_mod_dav_svn_config(
67 def _render_mod_dav_svn_config(
67 parent_path_root, list_parent_path, location_root, repo_groups, realm,
68 parent_path_root, list_parent_path, location_root, repo_groups, realm,
68 use_ssl, template):
69 use_ssl, template):
@@ -23,6 +23,8 b' Celery loader, run with::'
23 celery worker \
23 celery worker \
24 --task-events \
24 --task-events \
25 --beat \
25 --beat \
26 --autoscale=20,2 \
27 --max-tasks-per-child 1 \
26 --app rhodecode.lib.celerylib.loader \
28 --app rhodecode.lib.celerylib.loader \
27 --scheduler rhodecode.lib.celerylib.scheduler.RcScheduler \
29 --scheduler rhodecode.lib.celerylib.scheduler.RcScheduler \
28 --loglevel DEBUG --ini=.dev/dev.ini
30 --loglevel DEBUG --ini=.dev/dev.ini
@@ -135,12 +137,16 b' def on_preload_parsed(options, **kwargs)'
135 ini_file_glob = ini_location
137 ini_file_glob = ini_location
136
138
137 log.debug('Bootstrapping RhodeCode application...')
139 log.debug('Bootstrapping RhodeCode application...')
140
141 env = {}
138 try:
142 try:
139 env = bootstrap(ini_location, options=options)
143 env = bootstrap(ini_location, options=options)
140 except Exception:
144 except Exception:
141 log.exception('Failed to bootstrap RhodeCode APP')
145 log.exception('Failed to bootstrap RhodeCode APP')
142
146
147 log.debug('Got Pyramid ENV: %s', env)
143 celery_settings = get_celery_config(env['registry'].settings)
148 celery_settings = get_celery_config(env['registry'].settings)
149
144 setup_celery_app(
150 setup_celery_app(
145 app=env['app'], root=env['root'], request=env['request'],
151 app=env['app'], root=env['root'], request=env['request'],
146 registry=env['registry'], closer=env['closer'],
152 registry=env['registry'], closer=env['closer'],
@@ -43,7 +43,6 b' import pkg_resources'
43 from webhelpers2.text import collapse, remove_formatting
43 from webhelpers2.text import collapse, remove_formatting
44 from mako import exceptions
44 from mako import exceptions
45 from pyramid.threadlocal import get_current_registry
45 from pyramid.threadlocal import get_current_registry
46 from rhodecode.lib.request import Request
47
46
48 from rhodecode.lib.vcs.backends.base import Config
47 from rhodecode.lib.vcs.backends.base import Config
49 from rhodecode.lib.vcs.exceptions import VCSError
48 from rhodecode.lib.vcs.exceptions import VCSError
@@ -779,7 +779,6 b' class AttributeDict(AttributeDictBase):'
779 return self.get(attr, None)
779 return self.get(attr, None)
780
780
781
781
782
783 class OrderedDefaultDict(collections.OrderedDict, collections.defaultdict):
782 class OrderedDefaultDict(collections.OrderedDict, collections.defaultdict):
784 def __init__(self, default_factory=None, *args, **kwargs):
783 def __init__(self, default_factory=None, *args, **kwargs):
785 # in python3 you can omit the args to super
784 # in python3 you can omit the args to super
General Comments 0
You need to be logged in to leave comments. Login now