perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lib/connections: Consistent log levels & polish (fixes #4510)

Browse Source 
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4511
This commit is contained in:
Simon Frei 2017-11-14 21:49:36 +00:00 committed by Audrius Butkevicius
parent fa12a18190
commit 4efff736b3
8 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/connections/kcp_dial.go
View File

@ -44,7 +44,6 @@ func (d *kcpDialer) Dial(id protocol.DeviceID, uri *url.URL) (internalConn, erro
conn, err = kcp.DialWithOptions(uri.Host, nil, 0, 0) conn, err = kcp.DialWithOptions(uri.Host, nil, 0, 0)
} }
if err != nil { if err != nil {
l.Debugln(err)
conn.Close() conn.Close()
return internalConn{}, err return internalConn{}, err
} }

6
lib/connections/kcp_listen.go
View File

@ -59,7 +59,7 @@ func (t *kcpListener) Serve() {
t.mut.Lock() t.mut.Lock()
t.err = err t.err = err
t.mut.Unlock() t.mut.Unlock()
l.Infoln("listen (BEP/kcp):", err) l.Infoln("Listen (BEP/kcp):", err)
return return
} }
filterConn := pfilter.NewPacketFilter(packetConn) filterConn := pfilter.NewPacketFilter(packetConn)
@ -76,7 +76,7 @@ func (t *kcpListener) Serve() {
t.mut.Lock() t.mut.Lock()
t.err = err t.err = err
t.mut.Unlock() t.mut.Unlock()
l.Infoln("listen (BEP/kcp):", err) l.Infoln("Listen (BEP/kcp):", err)
return return
} }
@ -105,7 +105,7 @@ func (t *kcpListener) Serve() {
} }
if err != nil { if err != nil {
if err, ok := err.(net.Error); !ok || !err.Timeout() { if err, ok := err.(net.Error); !ok || !err.Timeout() {
l.Warnln("Accepting connection (BEP/kcp):", err) l.Warnln("Listen (BEP/kcp): Accepting connection:", err)
} }
continue continue
} }

2
lib/connections/relay_dial.go
View File

@ -45,7 +45,7 @@ func (d *relayDialer) Dial(id protocol.DeviceID, uri *url.URL) (internalConn, er
err = dialer.SetTrafficClass(conn, d.cfg.Options().TrafficClass) err = dialer.SetTrafficClass(conn, d.cfg.Options().TrafficClass)
if err != nil { if err != nil {
l.Debugf("failed to set traffic class: %s", err) l.Debugln("Dial (BEP/relay): setting traffic class:", err)
} }
var tc *tls.Conn var tc *tls.Conn

13
lib/connections/relay_listen.go
View File

@ -50,7 +50,7 @@ func (t *relayListener) Serve() {
t.mut.Lock() t.mut.Lock()
t.err = err t.err = err
t.mut.Unlock() t.mut.Unlock()
l.Warnln("listen (BEP/relay):", err) l.Warnln("Listen (BEP/relay):", err)
return return
} }
@ -62,6 +62,9 @@ func (t *relayListener) Serve() {
oldURI := clnt.URI() oldURI := clnt.URI()
l.Infof("Relay listener (%v) starting", t)
defer l.Infof("Relay listener (%v) shutting down", t)
for { for {
select { select {
case inv, ok := <-invitations: case inv, ok := <-invitations:
@ -71,18 +74,18 @@ func (t *relayListener) Serve() {
conn, err := client.JoinSession(inv) conn, err := client.JoinSession(inv)
if err != nil { if err != nil {
l.Infoln("Joining relay session (BEP/relay):", err) l.Infoln("Listen (BEP/relay): joining session:", err)
continue continue
} }
err = dialer.SetTCPOptions(conn) err = dialer.SetTCPOptions(conn)
if err != nil { if err != nil {
l.Infoln(err) l.Debugln("Listen (BEP/relay): setting tcp options:", err)
} }
err = dialer.SetTrafficClass(conn, t.cfg.Options().TrafficClass) err = dialer.SetTrafficClass(conn, t.cfg.Options().TrafficClass)
if err != nil { if err != nil {
l.Debugf("failed to set traffic class: %s", err) l.Debugln("Listen (BEP/relay): setting traffic class:", err)
} }
var tc *tls.Conn var tc *tls.Conn
@ -95,7 +98,7 @@ func (t *relayListener) Serve() {
err = tlsTimedHandshake(tc) err = tlsTimedHandshake(tc)
if err != nil { if err != nil {
tc.Close() tc.Close()
l.Infoln("TLS handshake (BEP/relay):", err) l.Infoln("Listen (BEP/relay): TLS handshake:", err)
continue continue
} }

12
lib/connections/service.go
View File

@ -369,7 +369,7 @@ func (s *Service) connect() {
uri, err := url.Parse(addr) uri, err := url.Parse(addr)
if err != nil { if err != nil {
l.Infof("Dialer for %s: %v", addr, err) l.Infof("Parsing dialer address %s: %v", addr, err)
continue continue
} }
@ -382,11 +382,11 @@ func (s *Service) connect() {
dialerFactory, err := s.getDialerFactory(cfg, uri) dialerFactory, err := s.getDialerFactory(cfg, uri)
if err == errDisabled { if err == errDisabled {
l.Debugln("Dialer for", uri, "is disabled") l.Debugln(dialerFactory, "for", uri, "is disabled")
continue continue
} }
if err != nil { if err != nil {
l.Infof("Dialer for %v: %v", uri, err) l.Infof("%v for %v: %v", dialerFactory, uri, err)
continue continue
} }
@ -401,7 +401,7 @@ func (s *Service) connect() {
conn, err := dialer.Dial(deviceID, uri) conn, err := dialer.Dial(deviceID, uri)
if err != nil { if err != nil {
l.Debugln("dial failed", deviceCfg.DeviceID, uri, err) l.Debugf("%v for %v at %v: %v", dialerFactory, deviceCfg.DeviceID, uri, err)
continue continue
} }
@ -505,7 +505,7 @@ func (s *Service) CommitConfiguration(from, to config.Configuration) bool {
uri, err := url.Parse(addr) uri, err := url.Parse(addr)
if err != nil { if err != nil {
l.Infof("Listener for %s: %v", addr, err) l.Infof("Parsing listener address %s: %v", addr, err)
continue continue
} }
@ -515,7 +515,7 @@ func (s *Service) CommitConfiguration(from, to config.Configuration) bool {
continue continue
} }
if err != nil { if err != nil {
l.Infof("Listener for %v: %v", uri, err) l.Infof("Getting listener factory for %v: %v", uri, err)
continue continue
} }

5
lib/connections/tcp_dial.go
View File

@ -33,18 +33,17 @@ func (d *tcpDialer) Dial(id protocol.DeviceID, uri *url.URL) (internalConn, erro
conn, err := dialer.DialTimeout(uri.Scheme, uri.Host, 10*time.Second) conn, err := dialer.DialTimeout(uri.Scheme, uri.Host, 10*time.Second)
if err != nil { if err != nil {
l.Debugln(err)
return internalConn{}, err return internalConn{}, err
} }
err = dialer.SetTCPOptions(conn) err = dialer.SetTCPOptions(conn)
if err != nil { if err != nil {
l.Infoln(err) l.Debugln("Dial (BEP/tcp): setting tcp options:", err)
} }
err = dialer.SetTrafficClass(conn, d.cfg.Options().TrafficClass) err = dialer.SetTrafficClass(conn, d.cfg.Options().TrafficClass)
if err != nil { if err != nil {
l.Debugf("failed to set traffic class: %s", err) l.Debugln("Dial (BEP/tcp): setting traffic class:", err)
} }
tc := tls.Client(conn, d.tlsCfg) tc := tls.Client(conn, d.tlsCfg)

14
lib/connections/tcp_listen.go
View File

@ -52,7 +52,7 @@ func (t *tcpListener) Serve() {
t.mut.Lock() t.mut.Lock()
t.err = err t.err = err
t.mut.Unlock() t.mut.Unlock()
l.Infoln("listen (BEP/tcp):", err) l.Infoln("Listen (BEP/tcp):", err)
return return
} }
@ -61,7 +61,7 @@ func (t *tcpListener) Serve() {
t.mut.Lock() t.mut.Lock()
t.err = err t.err = err
t.mut.Unlock() t.mut.Unlock()
l.Infoln("listen (BEP/tcp):", err) l.Infoln("Listen (BEP/tcp):", err)
return return
} }
defer listener.Close() defer listener.Close()
@ -95,27 +95,27 @@ func (t *tcpListener) Serve() {
} }
if err != nil { if err != nil {
if err, ok := err.(*net.OpError); !ok || !err.Timeout() { if err, ok := err.(*net.OpError); !ok || !err.Timeout() {
l.Warnln("Accepting connection (BEP/tcp):", err) l.Warnln("Listen (BEP/tcp): Accepting connection:", err)
} }
continue continue
} }
l.Debugln("connect from", conn.RemoteAddr()) l.Debugln("Listen (BEP/tcp): connect from", conn.RemoteAddr())
err = dialer.SetTCPOptions(conn) err = dialer.SetTCPOptions(conn)
if err != nil { if err != nil {
l.Infoln(err) l.Debugln("Listen (BEP/tcp): setting tcp options:", err)
} }
err = dialer.SetTrafficClass(conn, t.cfg.Options().TrafficClass) err = dialer.SetTrafficClass(conn, t.cfg.Options().TrafficClass)
if err != nil { if err != nil {
l.Debugf("failed to set traffic class: %s", err) l.Debugln("Listen (BEP/tcp): setting traffic class:", err)
} }
tc := tls.Server(conn, t.tlsCfg) tc := tls.Server(conn, t.tlsCfg)
err = tlsTimedHandshake(tc) err = tlsTimedHandshake(tc)
if err != nil { if err != nil {
l.Infoln("TLS handshake (BEP/tcp):", err) l.Infoln("Listen (BEP/tcp): TLS handshake:", err)
tc.Close() tc.Close()
continue continue
} }

8
lib/upnp/upnp.go
View File

@ -152,14 +152,14 @@ USER-AGENT: syncthing/1.0
socket, err := net.ListenMulticastUDP("udp4", intf, &net.UDPAddr{IP: ssdp.IP}) socket, err := net.ListenMulticastUDP("udp4", intf, &net.UDPAddr{IP: ssdp.IP})
if err != nil { if err != nil {
l.Debugln(err) l.Debugln("UPnP discovery: listening to udp multicast:", err)
return return
} }
defer socket.Close() // Make sure our socket gets closed defer socket.Close() // Make sure our socket gets closed
err = socket.SetDeadline(time.Now().Add(timeout)) err = socket.SetDeadline(time.Now().Add(timeout))
if err != nil { if err != nil {
l.Infoln(err) l.Debugln("UPnP discovery: setting socket deadline:", err)
return return
} }
@ -168,7 +168,7 @@ USER-AGENT: syncthing/1.0
_, err = socket.WriteTo(search, ssdp) _, err = socket.WriteTo(search, ssdp)
if err != nil { if err != nil {
if e, ok := err.(net.Error); !ok || !e.Timeout() { if e, ok := err.(net.Error); !ok || !e.Timeout() {
l.Infoln(err) l.Debugln("UPnP discovery: sending search request:", err)
} }
return return
} }
@ -424,7 +424,7 @@ func soapRequest(url, service, function, message string) ([]byte, error) {
r, err := http.DefaultClient.Do(req) r, err := http.DefaultClient.Do(req)
if err != nil { if err != nil {
l.Debugln(err) l.Debugln("SOAP do:", err)
return resp, err return resp, err
} }