octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-02-02 03:48:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename Model.clusterConfig to Model.generateClusterConfig

Browse Source
This commit is contained in:
Jakob Borg 2015-11-17 12:08:53 +01:00
parent 0167b4b4a3
commit 9cf653d673
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/model/model.go
View File

@ -956,7 +956,7 @@ func (m *Model) AddConnection(conn Connection) {
conn.Start() conn.Start()
cm := m.clusterConfig(deviceID) cm := m.generateClusterConfig(deviceID)
conn.ClusterConfig(cm) conn.ClusterConfig(cm)
m.fmut.RLock() m.fmut.RLock()
@ -1476,8 +1476,9 @@ func (m *Model) numHashers(folder string) int {
return 1 return 1
} }
// clusterConfig returns a ClusterConfigMessage that is correct for the given peer device // generateClusterConfig returns a ClusterConfigMessage that is correct for
func (m *Model) clusterConfig(device protocol.DeviceID) protocol.ClusterConfigMessage { // the given peer device
func (m *Model) generateClusterConfig(device protocol.DeviceID) protocol.ClusterConfigMessage {
cm := protocol.ClusterConfigMessage{ cm := protocol.ClusterConfigMessage{
DeviceName: m.deviceName, DeviceName: m.deviceName,
ClientName: m.clientName, ClientName: m.clientName,

2
lib/model/model_test.go
View File

@ -385,7 +385,7 @@ func TestClusterConfig(t *testing.T) {
m.AddFolder(cfg.Folders[1]) m.AddFolder(cfg.Folders[1])
m.ServeBackground() m.ServeBackground()
cm := m.clusterConfig(device2) cm := m.generateClusterConfig(device2)
if l := len(cm.Folders); l != 2 { if l := len(cm.Folders); l != 2 {
t.Fatalf("Incorrect number of folders %d != 2", l) t.Fatalf("Incorrect number of folders %d != 2", l)