Merge branch 'main' into v2

* main:
  feat(config): expose folder and device info as metrics (fixes #9519) (#10148)
  chore: add issue types to GitHub issue templates
  build: remove schedule from PR metadata job
  chore(protocol): only allow enc. password changes on cluster config (#10145)
  chore(protocol): don't start connection routines a second time (#10146)
This commit is contained in:
Jakob Borg
2025-05-31 17:10:00 +02:00
15 changed files with 132 additions and 111 deletions
+3 -6
View File
@@ -1641,8 +1641,7 @@ func (m *model) sendClusterConfig(ids []protocol.DeviceID) {
// Generating cluster-configs acquires the mutex.
for _, conn := range ccConns {
cm, passwords := m.generateClusterConfig(conn.DeviceID())
conn.SetFolderPasswords(passwords)
go conn.ClusterConfig(cm)
go conn.ClusterConfig(cm, passwords)
}
}
@@ -2379,10 +2378,9 @@ func (m *model) promoteConnections() {
l.Debugf("Promoting connection to %s at %s", deviceID.Short(), conn)
postLockActions = append(postLockActions, func() {
if conn.Statistics().StartedAt.IsZero() {
conn.SetFolderPasswords(passwords)
conn.Start()
}
conn.ClusterConfig(cm)
conn.ClusterConfig(cm, passwords)
})
m.promotedConnID[deviceID] = connIDs[0]
}
@@ -2393,9 +2391,8 @@ func (m *model) promoteConnections() {
conn := m.connections[connID]
if conn.Statistics().StartedAt.IsZero() {
postLockActions = append(postLockActions, func() {
conn.SetFolderPasswords(passwords)
conn.Start()
conn.ClusterConfig(&protocol.ClusterConfig{Secondary: true})
conn.ClusterConfig(&protocol.ClusterConfig{Secondary: true}, passwords)
})
}
}