mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-11-27 03:58:06 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix ClientReplicationStreamProtocol.__str__ (#4929)

Browse source 
`__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.
This commit is contained in:
Richard van der Hoff 2019-03-25 16:41:51 +00:00 committed by GitHub
parent 9bde730ef8
commit 8cbbedaa2b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/4929.misc Normal file
View file

@ -0,0 +1 @@
Fix `ClientReplicationStreamProtocol.__str__()`.

8
synapse/replication/tcp/protocol.py
View file

@ -375,8 +375,11 @@ class BaseReplicationStreamProtocol(LineOnlyReceiver):
self.transport.unregisterProducer() self.transport.unregisterProducer()
def __str__(self): def __str__(self):
addr = None
if self.transport:
addr = str(self.transport.getPeer())
return "ReplicationConnection<name=%s,conn_id=%s,addr=%s>" % ( 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): def id(self):
@ -392,12 +395,11 @@ class ServerReplicationStreamProtocol(BaseReplicationStreamProtocol):
VALID_INBOUND_COMMANDS = VALID_CLIENT_COMMANDS VALID_INBOUND_COMMANDS = VALID_CLIENT_COMMANDS
VALID_OUTBOUND_COMMANDS = VALID_SERVER_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 BaseReplicationStreamProtocol.__init__(self, clock) # Old style class
self.server_name = server_name self.server_name = server_name
self.streamer = streamer self.streamer = streamer
self.addr = addr
# The streams the client has subscribed to and is up to date with # The streams the client has subscribed to and is up to date with
self.replication_streams = set() self.replication_streams = set()

1
synapse/replication/tcp/resource.py
View file

@ -57,7 +57,6 @@ class ReplicationStreamProtocolFactory(Factory):
self.server_name, self.server_name,
self.clock, self.clock,
self.streamer, self.streamer,
addr
) )