Remove pointless CompareClusterConfig

calmh · Jul 31, 2014 · 830be10 · 830be10
1 parent e9e45d0
commit 830be10
Show file tree

Hide file tree

Showing 3 changed files with 510 additions and 51 deletions.
diff --git a/model/model.go b/model/model.go
@@ -396,17 +396,6 @@ func (m *Model) repoSharedWith(repo string, nodeID protocol.NodeID) bool {
 }
 
 func (m *Model) ClusterConfig(nodeID protocol.NodeID, config protocol.ClusterConfigMessage) {
-	compErr := compareClusterConfig(m.clusterConfig(nodeID), config)
-	if debug {
-		l.Debugf("ClusterConfig: %s: %#v", nodeID, config)
-		l.Debugf("  ... compare: %s: %v", nodeID, compErr)
-	}
-
-	if compErr != nil {
-		l.Warnf("%s: %v", nodeID, compErr)
-		m.Close(nodeID, compErr)
-	}
-
 	m.pmut.Lock()
 	if config.ClientName == "syncthing" {
 		m.nodeVer[nodeID] = config.ClientVersion