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
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/connections/service.go
View File

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