From fd4b75cfa8e1b5de9eba9ea4dc89cfe3bb291a91 Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Wed, 6 May 2015 22:58:03 +0200 Subject: [PATCH] p2p/nat: less confusing error logging --- p2p/nat/nat.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/p2p/nat/nat.go b/p2p/nat/nat.go index 4ae7e6b17..fe00bdab0 100644 --- a/p2p/nat/nat.go +++ b/p2p/nat/nat.go @@ -91,7 +91,8 @@ func Map(m Interface, c chan struct{}, protocol string, extport, intport int, na }() glog.V(logger.Debug).Infof("add mapping: %s %d -> %d (%s) using %s\n", protocol, extport, intport, name, m) if err := m.AddMapping(protocol, intport, extport, name, mapTimeout); err != nil { - glog.V(logger.Error).Infof("mapping error: %v\n", err) + glog.V(logger.Warn).Infof("network port %d could not be mapped: %v\n", intport, err) + glog.V(logger.Debug).Infof("mapping with %v returned %v\n", m, err) } for { select { @@ -102,7 +103,8 @@ func Map(m Interface, c chan struct{}, protocol string, extport, intport int, na case <-refresh.C: glog.V(logger.Detail).Infof("refresh mapping: %s %d -> %d (%s) using %s\n", protocol, extport, intport, name, m) if err := m.AddMapping(protocol, intport, extport, name, mapTimeout); err != nil { - glog.V(logger.Error).Infof("mapping error: %v\n", err) + glog.V(logger.Warn).Infof("network port %d could not be mapped: %v\n", intport, err) + glog.V(logger.Debug).Infof("mapping with %v returned %v\n", m, err) } refresh.Reset(mapUpdateInterval) } @@ -225,7 +227,7 @@ func (n *autodisc) wait() error { return nil } if found = <-n.done; found == nil { - return errors.New("no devices discovered") + return errors.New("no UPnP or NAT-PMP router discovered") } n.mu.Lock() n.found = found