0001-tests-disable-syslog-logging-handler-51267.patch

Benjamin Dauvergne, 19 février 2021 08:47

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

Subject: [PATCH] tests: disable syslog logging handler (#51267)

 debian/debian_config_common.py | 10 ++++++----
 tox.ini                        |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

         '%(levelname)s \x1f%(name)s \x1f%(message)s'
+    )
     DISABLE_GLOBAL_HANDLERS = os.environ['DISABLE_GLOBAL_HANDLERS'] == 1
     LOGGING = {
         'version': 1,
         'disable_existing_loggers': True,
-...
             },
             # log py.warnings to syslog
             'py.warnings': {
                 'handlers': ['syslog_no_filter'],
                 'handlers': [] if DISABLE_GLOBAL_HANDLERS else ['syslog_no_filter'],
                 'level': 'WARNING',
                 'propagate': False,
             },
             '': {
                 'level': 'DEBUG',
                 'filters': ['request_context'],
                 'handlers': ['syslog', 'mail_admins', 'debug'],
                 'handlers': ([] if DISABLE_GLOBAL_HANDLERS else ['syslog']) + ['mail_admins', 'debug'],
             },
         },
+    }
     # Journald support
     if os.path.exists('/run/systemd/journal/socket'):
     if os.path.exists('/run/systemd/journal/socket') and not DISABLE_GLOBAL_HANDLERS:
         try:
             from systemd import journal
         except ImportError:
-...
             LOGGING['loggers']['']['handlers'].remove('syslog')
             LOGGING['loggers']['']['handlers'].append('journald')
     elif not os.path.exists('/dev/log'):
     elif not os.path.exists('/dev/log') and not DISABLE_GLOBAL_HANDLERS:
         # if three's no syslog (for example when building a docker image), remove
         # those loggers.
         LOGGING['loggers']['']['handlers'].remove('syslog')

     [testenv]
     usedevelop = True
     setenv =
     	DISABLE_GLOBAL_HANDLERS=1
     	BRANCH_NAME={env:BRANCH_NAME:}
     	DB_ENGINE=django.db.backends.postgresql_psycopg2
     	SETUPTOOLS_USE_DISTUTILS=stdlib
+    -

Projet

Général

Profil

Produits Entr'ouvert » Hobo

0001-tests-disable-syslog-logging-handler-51267.patch