From b4334ff71a4b71fa1324e9641ca8f36a96481e02 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Tue, 14 Jul 2020 10:07:57 +0100 Subject: Handle empty suffixes in nested_logging_context --- synapse/logging/context.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/synapse/logging/context.py b/synapse/logging/context.py index 8b9c4e38bd..e1d63e6db3 100644 --- a/synapse/logging/context.py +++ b/synapse/logging/context.py @@ -659,9 +659,10 @@ def nested_logging_context( context = parent_context # type: LoggingContextOrSentinel else: context = current_context() - return LoggingContext( - parent_context=context, request=str(context.request) + "-" + suffix - ) + name = str(context.request) + if suffix: + name = name + "-" + suffix + return LoggingContext(parent_context=context, request=name) def preserve_fn(f): -- cgit 1.5.1