app: improve logging, and remove DB calls on app startup.
This commit is contained in:
parent
620dcdcd3f
commit
f5bed7486e
4 changed files with 11 additions and 11 deletions
|
|
@ -36,7 +36,7 @@ from rhodecode.authentication.plugins import auth_rhodecode
|
|||
from rhodecode.events import trigger
|
||||
from rhodecode.model.db import true, UserNotice
|
||||
|
||||
from rhodecode.lib import audit_logger, rc_cache
|
||||
from rhodecode.lib import audit_logger, rc_cache, auth
|
||||
from rhodecode.lib.exceptions import (
|
||||
UserCreationError, UserOwnsReposException, UserOwnsRepoGroupsException,
|
||||
UserOwnsUserGroupsException, UserOwnsPullRequestsException,
|
||||
|
|
@ -295,6 +295,10 @@ class UsersView(UserAppView):
|
|||
c.allowed_extern_types = [
|
||||
(x.uid, x.get_display_name()) for x in self.get_auth_plugins()
|
||||
]
|
||||
perms = req.registry.settings.get('available_permissions')
|
||||
if not perms:
|
||||
# inject info about available permissions
|
||||
auth.set_available_permissions(req.registry.settings)
|
||||
|
||||
c.available_permissions = req.registry.settings['available_permissions']
|
||||
PermissionModel().set_global_permission_choices(
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ from rhodecode.lib.utils2 import aslist as rhodecode_aslist, AttributeDict
|
|||
from rhodecode.lib.exc_tracking import store_exception
|
||||
from rhodecode.subscribers import (
|
||||
scan_repositories_if_enabled, write_js_routes_if_enabled,
|
||||
write_metadata_if_needed, write_usage_data, inject_app_settings)
|
||||
write_metadata_if_needed, write_usage_data)
|
||||
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
|
@ -310,8 +310,6 @@ def includeme(config):
|
|||
|
||||
# Add subscribers.
|
||||
if load_all:
|
||||
config.add_subscriber(inject_app_settings,
|
||||
pyramid.events.ApplicationCreated)
|
||||
config.add_subscriber(scan_repositories_if_enabled,
|
||||
pyramid.events.ApplicationCreated)
|
||||
config.add_subscriber(write_metadata_if_needed,
|
||||
|
|
|
|||
|
|
@ -74,7 +74,11 @@ def configure_dogpile_cache(settings):
|
|||
|
||||
new_region.configure_from_config(settings, 'rc_cache.{}.'.format(region_name))
|
||||
new_region.function_key_generator = backend_key_generator(new_region.actual_backend)
|
||||
log.debug('dogpile: registering a new region %s[%s]', region_name, new_region.__dict__)
|
||||
if log.isEnabledFor(logging.DEBUG):
|
||||
region_args = dict(backend=new_region.actual_backend.__class__,
|
||||
region_invalidator=new_region.region_invalidator.__class__)
|
||||
log.debug('dogpile: registering a new region `%s` %s', region_name, region_args)
|
||||
|
||||
region_meta.dogpile_cache_regions[region_name] = new_region
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -104,12 +104,6 @@ def add_request_user_context(event):
|
|||
request.environ['rc_req_id'] = req_id
|
||||
|
||||
|
||||
def inject_app_settings(event):
|
||||
settings = event.app.registry.settings
|
||||
# inject info about available permissions
|
||||
auth.set_available_permissions(settings)
|
||||
|
||||
|
||||
def scan_repositories_if_enabled(event):
|
||||
"""
|
||||
This is subscribed to the `pyramid.events.ApplicationCreated` event. It
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue