From 5369a62fd5e362dc6a126002b64d2af418acff3e Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Wed, 28 May 2014 12:39:33 +0200 Subject: [PATCH] Allow repo mismatches to proceed (ref #223) --- config/config.go | 2 +- model/model.go | 3 ++- model/util.go | 9 --------- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/config/config.go b/config/config.go index 1698650d..d0c28e7d 100644 --- a/config/config.go +++ b/config/config.go @@ -244,7 +244,7 @@ func Load(rd io.Reader, myID string) (Configuration, error) { repo := &cfg.Repositories[i] if len(repo.Directory) == 0 { - repo.Invalid = "empty directory" + repo.Invalid = "no directory configured" continue } diff --git a/model/model.go b/model/model.go index 654eee8b..2cff2f0f 100644 --- a/model/model.go +++ b/model/model.go @@ -275,7 +275,8 @@ func (m *Model) Index(nodeID string, repo string, fs []protocol.FileInfo) { if r, ok := m.repoFiles[repo]; ok { r.Replace(id, files) } else { - l.Warnf("Index from %s for nonexistant repo %q; dropping", nodeID, repo) + l.Warnf("Index from %s for unexpected repo %q; verify configuration", nodeID, repo) + } m.rmut.RUnlock() } diff --git a/model/util.go b/model/util.go index 2ccd20bb..82573bb0 100644 --- a/model/util.go +++ b/model/util.go @@ -81,17 +81,8 @@ func compareClusterConfig(local, remote protocol.ClusterConfigMessage) error { } } } - } else { - return ClusterConfigMismatch(fmt.Errorf("remote is missing repository %q", repo)) } } - for repo := range rm { - if _, ok := lm[repo]; !ok { - return ClusterConfigMismatch(fmt.Errorf("remote has extra repository %q", repo)) - } - - } - return nil }