diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2021-04-20 09:19:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-20 14:19:00 +0100 |
| commit | b076bc276e881b262048307b6a226061d96c4a8d (patch) | |
| tree | b3aec240ad5786c003a12531f75f5919558fd723 /synapse/replication/tcp | |
| parent | Update changelog for v1.32.0 (diff) | |
| download | synapse-b076bc276e881b262048307b6a226061d96c4a8d.tar.xz | |
Always use the name as the log ID. (#9829)
As far as I can tell our logging contexts are meant to log the request ID, or sometimes the request ID followed by a suffix (this is generally stored in the name field of LoggingContext). There's also code to log the name@memory location, but I'm not sure this is ever used. This simplifies the code paths to require every logging context to have a name and use that in logging. For sub-contexts (created via nested_logging_contexts, defer_to_threadpool, Measure) we use the current context's str (which becomes their name or the string "sentinel") and then potentially modify that (e.g. add a suffix).
Diffstat (limited to 'synapse/replication/tcp')
| -rw-r--r-- | synapse/replication/tcp/protocol.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/replication/tcp/protocol.py b/synapse/replication/tcp/protocol.py index d10d574246..ba753318bd 100644 --- a/synapse/replication/tcp/protocol.py +++ b/synapse/replication/tcp/protocol.py @@ -185,7 +185,7 @@ class BaseReplicationStreamProtocol(LineOnlyReceiver): # a logcontext which we use for processing incoming commands. We declare it as a # background process so that the CPU stats get reported to prometheus. self._logging_context = BackgroundProcessLoggingContext( - "replication-conn", self.conn_id + "replication-conn-%s" % (self.conn_id,) ) def connectionMade(self): |