diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-03-25 16:41:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-25 16:41:51 +0000 |
| commit | 8cbbedaa2b459ce17a294535b434ad808963bd8f (patch) | |
| tree | e953cce66d22ac970bac901f6006c1d01d001192 /synapse | |
| parent | Fix bug where read-receipts lost their timestamps (#4927) (diff) | |
| download | synapse-8cbbedaa2b459ce17a294535b434ad808963bd8f.tar.xz | |
Fix ClientReplicationStreamProtocol.__str__ (#4929)
`__str__` depended on `self.addr`, which was absent from ClientReplicationStreamProtocol, so attempting to call str on such an object would raise an exception. We can calculate the peer addr from the transport, so there is no need for addr anyway.
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/replication/tcp/protocol.py | 8 | ||||
| -rw-r--r-- | synapse/replication/tcp/resource.py | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/synapse/replication/tcp/protocol.py b/synapse/replication/tcp/protocol.py index e16fad5261..02e5bf6cc8 100644 --- a/synapse/replication/tcp/protocol.py +++ b/synapse/replication/tcp/protocol.py @@ -375,8 +375,11 @@ class BaseReplicationStreamProtocol(LineOnlyReceiver): self.transport.unregisterProducer() def __str__(self): + addr = None + if self.transport: + addr = str(self.transport.getPeer()) return "ReplicationConnection<name=%s,conn_id=%s,addr=%s>" % ( - self.name, self.conn_id, self.addr, + self.name, self.conn_id, addr, ) def id(self): @@ -392,12 +395,11 @@ class ServerReplicationStreamProtocol(BaseReplicationStreamProtocol): VALID_INBOUND_COMMANDS = VALID_CLIENT_COMMANDS VALID_OUTBOUND_COMMANDS = VALID_SERVER_COMMANDS - def __init__(self, server_name, clock, streamer, addr): + def __init__(self, server_name, clock, streamer): BaseReplicationStreamProtocol.__init__(self, clock) # Old style class self.server_name = server_name self.streamer = streamer - self.addr = addr # The streams the client has subscribed to and is up to date with self.replication_streams = set() diff --git a/synapse/replication/tcp/resource.py b/synapse/replication/tcp/resource.py index 47cdf30bd3..7fc346c7b6 100644 --- a/synapse/replication/tcp/resource.py +++ b/synapse/replication/tcp/resource.py @@ -57,7 +57,6 @@ class ReplicationStreamProtocolFactory(Factory): self.server_name, self.clock, self.streamer, - addr ) |