logos-storage/nim-libp2p
1
0
Fork 0
mirror of https://github.com/logos-storage/nim-libp2p.git synced 2026-01-07 16:13:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handling Opt[PeerId] in logging (#923)

Browse Source
This commit is contained in:
diegomrsantos 2023-06-28 17:00:33 +02:00 committed by GitHub
parent 66f9dc9167
commit f85d0f75ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libp2p/dialer.nim
View File

@ -58,16 +58,16 @@ proc dialAndUpgrade(
for transport in self.transports: # for each transport for transport in self.transports: # for each transport
if transport.handles(address): # check if it can dial it if transport.handles(address): # check if it can dial it
trace "Dialing address", address, peerId, hostname trace "Dialing address", address, peerId = peerId.get(default(PeerId)), hostname
let dialed = let dialed =
try: try:
libp2p_total_dial_attempts.inc() libp2p_total_dial_attempts.inc()
await transport.dial(hostname, address, peerId) await transport.dial(hostname, address, peerId)
except CancelledError as exc: except CancelledError as exc:
debug "Dialing canceled", msg = exc.msg, peerId debug "Dialing canceled", err = exc.msg, peerId = peerId.get(default(PeerId))
raise exc raise exc
except CatchableError as exc: except CatchableError as exc:
debug "Dialing failed", msg = exc.msg, peerId debug "Dialing failed", err = exc.msg, peerId = peerId.get(default(PeerId))
libp2p_failed_dials.inc() libp2p_failed_dials.inc()
return nil # Try the next address return nil # Try the next address
@ -81,7 +81,7 @@ proc dialAndUpgrade(
# If we failed to establish the connection through one transport, # If we failed to establish the connection through one transport,
# we won't succeeded through another - no use in trying again # we won't succeeded through another - no use in trying again
await dialed.close() await dialed.close()
debug "Upgrade failed", msg = exc.msg, peerId debug "Upgrade failed", err = exc.msg, peerId = peerId.get(default(PeerId))
if exc isnot CancelledError: if exc isnot CancelledError:
if upgradeDir == Direction.Out: if upgradeDir == Direction.Out:
libp2p_failed_upgrades_outgoing.inc() libp2p_failed_upgrades_outgoing.inc()
@ -131,7 +131,7 @@ proc dialAndUpgrade(
upgradeDir = Direction.Out): upgradeDir = Direction.Out):
Future[Muxer] {.async.} = Future[Muxer] {.async.} =
debug "Dialing peer", peerId debug "Dialing peer", peerId = peerId.get(default(PeerId))
for rawAddress in addrs: for rawAddress in addrs:
# resolve potential dnsaddr # resolve potential dnsaddr
@ -324,7 +324,7 @@ method dial*(
await cleanup() await cleanup()
raise exc raise exc
except CatchableError as exc: except CatchableError as exc:
debug "Error dialing", conn, msg = exc.msg debug "Error dialing", conn, err = exc.msg
await cleanup() await cleanup()
raise exc raise exc