diff options
| author | Felix Lange <fjl@twurst.com> | 2017-02-24 16:58:04 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2017-02-28 17:20:29 +0800 |
| commit | 96ae35e2ac8c360781407d7294081aabdcbb3652 (patch) | |
| tree | 378cc7aae99127a4e85a721e5cd319ced87e103a /p2p/nat | |
| parent | 35e8308bf76df11c3c1e8d11fac782814583ea5c (diff) | |
| download | dexon-96ae35e2ac8c360781407d7294081aabdcbb3652.tar dexon-96ae35e2ac8c360781407d7294081aabdcbb3652.tar.gz dexon-96ae35e2ac8c360781407d7294081aabdcbb3652.tar.bz2 dexon-96ae35e2ac8c360781407d7294081aabdcbb3652.tar.lz dexon-96ae35e2ac8c360781407d7294081aabdcbb3652.tar.xz dexon-96ae35e2ac8c360781407d7294081aabdcbb3652.tar.zst dexon-96ae35e2ac8c360781407d7294081aabdcbb3652.zip | |
p2p, p2p/discover, p2p/nat: rework logging using context keys
Diffstat (limited to 'p2p/nat')
| -rw-r--r-- | p2p/nat/nat.go | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/p2p/nat/nat.go b/p2p/nat/nat.go index e5883cf98..a254648c6 100644 --- a/p2p/nat/nat.go +++ b/p2p/nat/nat.go @@ -98,16 +98,17 @@ const ( // Map adds a port mapping on m and keeps it alive until c is closed. // This function is typically invoked in its own goroutine. func Map(m Interface, c chan struct{}, protocol string, extport, intport int, name string) { + log := log.New("proto", protocol, "extport", extport, "intport", intport, "interface", m) refresh := time.NewTimer(mapUpdateInterval) defer func() { refresh.Stop() - log.Debug(fmt.Sprintf("deleting port mapping: %s %d -> %d (%s) using %s", protocol, extport, intport, name, m)) + log.Debug("Deleting port mapping") m.DeleteMapping(protocol, extport, intport) }() if err := m.AddMapping(protocol, extport, intport, name, mapTimeout); err != nil { - log.Debug(fmt.Sprintf("network port %s:%d could not be mapped: %v", protocol, intport, err)) + log.Debug("Couldn't add port mapping", "err", err) } else { - log.Info(fmt.Sprintf("mapped network port %s:%d -> %d (%s) using %s", protocol, extport, intport, name, m)) + log.Info("Mapped network port") } for { select { @@ -116,9 +117,9 @@ func Map(m Interface, c chan struct{}, protocol string, extport, intport int, na return } case <-refresh.C: - log.Trace(fmt.Sprintf("refresh port mapping %s:%d -> %d (%s) using %s", protocol, extport, intport, name, m)) + log.Trace("Refreshing port mapping") if err := m.AddMapping(protocol, extport, intport, name, mapTimeout); err != nil { - log.Debug(fmt.Sprintf("network port %s:%d could not be mapped: %v", protocol, intport, err)) + log.Debug("Couldn't add port mapping", "err", err) } refresh.Reset(mapUpdateInterval) } |