varun-r-mallya/py-libp2p
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/py-libp2p.git synced 2026-02-12 16:10:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply PR feedback

Browse Source
This commit is contained in:
NIC619
2019-09-15 15:09:58 +08:00
parent 501513b747
commit f368f5e93b
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libp2p/network/swarm.py
View File

@ -126,10 +126,10 @@ class Swarm(INetwork):
try: try:
secured_conn = await self.upgrader.upgrade_security(raw_conn, peer_id, True) secured_conn = await self.upgrader.upgrade_security(raw_conn, peer_id, True)
except SecurityUpgradeFailure as error: except SecurityUpgradeFailure as error:
error_msg = "fail to upgrade security for peer %s" % peer_id error_msg = "fail to upgrade security for peer %s"
logger.debug(error_msg) logger.debug(error_msg, peer_id)
await raw_conn.close() await raw_conn.close()
raise SwarmException(error_msg) from error raise SwarmException(error_msg % peer_id) from error
logger.debug("upgraded security for peer %s", peer_id) logger.debug("upgraded security for peer %s", peer_id)
@ -138,10 +138,10 @@ class Swarm(INetwork):
secured_conn, self.generic_protocol_handler, peer_id secured_conn, self.generic_protocol_handler, peer_id
) )
except MuxerUpgradeFailure as error: except MuxerUpgradeFailure as error:
error_msg = "fail to upgrade mux for peer %s" % peer_id error_msg = "fail to upgrade mux for peer %s"
logger.debug(error_msg) logger.debug(error_msg, peer_id)
await secured_conn.close() await secured_conn.close()
raise SwarmException(error_msg) from error raise SwarmException(error_msg % peer_id) from error
logger.debug("upgraded mux for peer %s", peer_id) logger.debug("upgraded mux for peer %s", peer_id)
@ -232,10 +232,10 @@ class Swarm(INetwork):
raw_conn, ID(b""), False raw_conn, ID(b""), False
) )
except SecurityUpgradeFailure as error: except SecurityUpgradeFailure as error:
error_msg = "fail to upgrade security for peer at %s" % peer_addr error_msg = "fail to upgrade security for peer at %s"
logger.debug(error_msg) logger.debug(error_msg, peer_addr)
await raw_conn.close() await raw_conn.close()
raise SwarmException(error_msg) from error raise SwarmException(error_msg % peer_addr) from error
peer_id = secured_conn.get_remote_peer() peer_id = secured_conn.get_remote_peer()
logger.debug("upgraded security for peer at %s", peer_addr) logger.debug("upgraded security for peer at %s", peer_addr)
@ -246,10 +246,10 @@ class Swarm(INetwork):
secured_conn, self.generic_protocol_handler, peer_id secured_conn, self.generic_protocol_handler, peer_id
) )
except MuxerUpgradeFailure as error: except MuxerUpgradeFailure as error:
error_msg = "fail to upgrade mux for peer %s" % peer_id error_msg = "fail to upgrade mux for peer %s"
logger.debug(error_msg) logger.debug(error_msg, peer_id)
await secured_conn.close() await secured_conn.close()
raise SwarmException(error_msg) from error raise SwarmException(error_msg % peer_id) from error
logger.debug("upgraded mux for peer %s", peer_id) logger.debug("upgraded mux for peer %s", peer_id)
# Store muxed_conn with peer id # Store muxed_conn with peer id
self.connections[peer_id] = muxed_conn self.connections[peer_id] = muxed_conn