Handle empty suffixes in nested_logging_context

2020-07-14 10:07:57 +01:00
parent 55b359bd28
commit b4334ff71a
1 changed files with 4 additions and 3 deletions
--- 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):