diff --git a/cmd/syncthing/main.go b/cmd/syncthing/main.go index 2feb060f..0efa8afb 100644 --- a/cmd/syncthing/main.go +++ b/cmd/syncthing/main.go @@ -703,6 +703,9 @@ next: wr = &limitedWriter{conn, rateBucket} } protoConn := protocol.NewConnection(remoteID, conn, wr, m) + + l.Infof("Connection to %s established at %v", remoteID, conn.RemoteAddr()) + m.AddConnection(conn, protoConn) continue next } diff --git a/model/model.go b/model/model.go index 315bb5a5..7cabbcc9 100644 --- a/model/model.go +++ b/model/model.go @@ -366,16 +366,7 @@ func (m *Model) ClusterConfig(nodeID string, config protocol.ClusterConfigMessag // Close removes the peer from the model and closes the underlying connection if possible. // Implements the protocol.Model interface. func (m *Model) Close(node string, err error) { - if debug { - l.Debugf("%s: %v", node, err) - } - - // EOFs (disconnect) are usually nothing to worry about - if err != io.EOF && err != io.ErrUnexpectedEOF { - l.Warnf("Connection to %s closed: %v", node, err) - } else if debug { - l.Debugln("Connection to %s closed: %v", node, err) - } + l.Infof("Connection to %s closed: %v", node, err) cid := m.cm.Get(node) m.rmut.RLock()