From 631a663b62909fc37396d8a6aae18a015ddf064a Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Thu, 26 Dec 2019 19:52:17 +0100 Subject: [PATCH] request-wrapper: ensure we wrap WHOLE request not just logic after http detection. --- rhodecode/config/middleware.py | 4 +--- rhodecode/lib/middleware/request_wrapper.py | 1 + rhodecode/tweens.py | 3 +++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/rhodecode/config/middleware.py b/rhodecode/config/middleware.py index efc16c60..84e0a81b 100644 --- a/rhodecode/config/middleware.py +++ b/rhodecode/config/middleware.py @@ -428,9 +428,7 @@ def sanitize_settings_and_apply_defaults(global_config, settings): settings['beaker.session.url'] = 'redis://' + raw_url # Default includes, possible to change as a user - pyramid_includes = settings.setdefault('pyramid.includes', [ - 'rhodecode.lib.middleware.request_wrapper', - ]) + pyramid_includes = settings.setdefault('pyramid.includes', []) log.debug( "Using the following pyramid.includes: %s", pyramid_includes) diff --git a/rhodecode/lib/middleware/request_wrapper.py b/rhodecode/lib/middleware/request_wrapper.py index 9b0a8c9b..c85bc1e6 100644 --- a/rhodecode/lib/middleware/request_wrapper.py +++ b/rhodecode/lib/middleware/request_wrapper.py @@ -38,6 +38,7 @@ class RequestWrapperTween(object): def __call__(self, request): start = time.time() + log.debug('Starting request time measurement') try: response = self.handler(request) finally: diff --git a/rhodecode/tweens.py b/rhodecode/tweens.py index bf18b43e..ae8ea706 100644 --- a/rhodecode/tweens.py +++ b/rhodecode/tweens.py @@ -116,3 +116,6 @@ def includeme(config): 'pyramid.events.ContextFound') config.add_tween('rhodecode.tweens.vcs_detection_tween_factory') config.add_tween('rhodecode.tweens.sanity_check_factory') + + # This needs to be the LAST item + config.add_tween('rhodecode.lib.middleware.request_wrapper.RequestWrapperTween')