0001-debian-add-fixup-to-test-29149.patch

Nicolas Roche, 18 avril 2020 20:37

Voir les différences: en ligne côte à côte

Subject: [PATCH] debian: add fixup to test (#29149)

 debian/debian_config_common.py | 8 ++++++--
 hobo/logger.py                 | 3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

     if 'MIDDLEWARE' not in globals():
         MIDDLEWARE = global_settings.MIDDLEWARE
     if 'MIDDLEWARE_CLASSES' in globals():
         MIDDLEWARE_CLASSES = (
             'hobo.middleware.VersionMiddleware',  # /__version__
             'hobo.middleware.cors.CORSMiddleware',
             'hobo.middleware.debug.InternalIPMiddleware',
         ) + MIDDLEWARE_CLASSES
         if PROJECT_NAME != 'wcs' and 'authentic2' not in INSTALLED_APPS:
             MIDDLEWARE_CLASSES = MIDDLEWARE_CLASSES + (
                 'mellon.middleware.PassiveAuthenticationMiddleware',
+            )
         if 'authentic2' in INSTALLED_APPS:
-...
                 'hobo.agent.authentic2.middleware.ProvisionningMiddleware',
+            )
     else:
         MIDDLEWARE = (
             'hobo.middleware.VersionMiddleware',  # /__version__
             'hobo.middleware.cors.CORSMiddleware',
         ) + MIDDLEWARE
         if PROJECT_NAME != 'wcs':
             MIDDLEWARE = MIDDLEWARE + (
                 'hobo.middleware.debug.InternalIPMiddleware',
+            )
         if PROJECT_NAME != 'wcs' and 'authentic2' not in INSTALLED_APPS:
             MIDDLEWARE = MIDDLEWARE + (
                 'mellon.middleware.PassiveAuthenticationMiddleware',
+            )
         if 'authentic2' in INSTALLED_APPS:
             MIDDLEWARE = MIDDLEWARE + (
                 'hobo.agent.authentic2.middleware.ProvisionningMiddleware',
-...
         MELLON_DEFAULT_ASSERTION_CONSUMER_BINDING = 'artifact'
         MELLON_OPENED_SESSION_COOKIE_NAME = 'A2_OPENED_SESSION'
         MELLON_ADD_AUTHNREQUEST_NEXT_URL_EXTENSION = True
     if 'MIDDLEWARE_CLASSES' in globals():
         MIDDLEWARE_CLASSES = (
             'hobo.middleware.utils.StoreRequestMiddleware',
             'hobo.middleware.xforwardedfor.XForwardedForMiddleware',
             'hobo.middleware.debug.InternalIPMiddleware',
         ) + MIDDLEWARE_CLASSES
         MIDDLEWARE_CLASSES = MIDDLEWARE_CLASSES + (
             'hobo.middleware.PrometheusStatsMiddleware',)
     else:
         MIDDLEWARE = (
             'hobo.middleware.utils.StoreRequestMiddleware',
             'hobo.middleware.xforwardedfor.XForwardedForMiddleware',
             'hobo.middleware.debug.InternalIPMiddleware',
         ) + MIDDLEWARE
         MIDDLEWARE = MIDDLEWARE + (
             'hobo.middleware.PrometheusStatsMiddleware',)
     HOBO_MANAGER_HOMEPAGE_URL_VAR = 'portal_agent_url'
     HOBO_MANAGER_HOMEPAGE_TITLE_VAR = 'portal_agent_title'

     class ForceDebugFilter(logging.Filter):
         def filter(self, record):
             record.levelno = logging.DEBUG
             record.levelname = 'DEBUG'
             return super(ForceDebugFilter, self).filter(record)
     class DebugLogFilter(object):
     class DebugLogFilter(RequestContextFilter):
         '''Filter debug log records based on the DEBUG_LOG setting'''
         def filter(self, record):
             super(DebugLogFilter, self).filter(record)
             debug_log = getattr(settings, 'DEBUG_LOG', False)
             if debug_log is False:
                 return False
             elif debug_log is True:
                 return True
             elif hasattr(debug_log, 'encode'):
                 # debug_log is a string
+    -

Projet

Général

Profil

Produits Entr'ouvert » Hobo

0001-debian-add-fixup-to-test-29149.patch