octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-11-09 14:50:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use a more lenient cluster config check (fixes #148)

Browse Source
This commit is contained in:
Jakob Borg 2014-04-22 16:41:40 +02:00
parent e73b7e0398
commit 71684bfa45
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/syncthing/util.go
View File

@ -117,8 +117,6 @@ func compareClusterConfig(local, remote protocol.ClusterConfigMessage) error {
if lflags&protocol.FlagShareBits != rflags&protocol.FlagShareBits {
return ClusterConfigMismatch(fmt.Errorf("remote has different sharing flags for node %q in repository %q", node, repo))
}
} else {
return ClusterConfigMismatch(fmt.Errorf("remote is missing node %q in repository %q", node, repo))
}
}
} else {
@ -126,14 +124,8 @@ func compareClusterConfig(local, remote protocol.ClusterConfigMessage) error {
}
}
for repo, rnodes := range rm {
if lnodes, ok := lm[repo]; ok {
for node := range rnodes {
if _, ok := lnodes[node]; !ok {
return ClusterConfigMismatch(fmt.Errorf("remote has extra node %q in repository %q", node, repo))
}
}
} else {
for repo := range rm {
if _, ok := lm[repo]; !ok {
return ClusterConfigMismatch(fmt.Errorf("remote has extra repository %q", repo))
}

4
cmd/syncthing/util_test.go
View File

@ -103,7 +103,7 @@ var testcases = []struct {
{ID: "bar"},
},
},
err: `remote is missing node "a" in repository "foo"`,
err: "",
},
{
@ -130,7 +130,7 @@ var testcases = []struct {
{ID: "bar"},
},
},
err: `remote has extra node "b" in repository "foo"`,
err: "",
},
{