075a699aae
This should address issue as described in https://forum.syncthing.net/t/stun-nig-party-with-paused-devices/10942/13 Essentially the model and the connection service goes out of sync in terms of thinking if we are connected or not. Resort to model as being the ultimate source of truth. I can't immediately pin down how this happens, yet some ideas. ConfigSaved happens in separate routine, so it's possbile that we have some sort of device removed yet connection comes in parallel kind of thing. However, in this case the connection exists in the model, and does not exist in the connection service and the only way for the connection to be removed in the connection service is device removal from the config. Given the subject, this might also be related to the device being paused. Also, adds more info to the logs GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4533
122 lines
3.1 KiB
Go
122 lines
3.1 KiB
Go
// Copyright (C) 2016 The Syncthing Authors.
|
|
//
|
|
// This Source Code Form is subject to the terms of the Mozilla Public
|
|
// License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
|
// You can obtain one at https://mozilla.org/MPL/2.0/.
|
|
|
|
package main
|
|
|
|
import (
|
|
"time"
|
|
|
|
"github.com/syncthing/syncthing/lib/connections"
|
|
"github.com/syncthing/syncthing/lib/db"
|
|
"github.com/syncthing/syncthing/lib/model"
|
|
"github.com/syncthing/syncthing/lib/protocol"
|
|
"github.com/syncthing/syncthing/lib/stats"
|
|
)
|
|
|
|
type mockedModel struct{}
|
|
|
|
func (m *mockedModel) GlobalDirectoryTree(folder, prefix string, levels int, dirsonly bool) map[string]interface{} {
|
|
return nil
|
|
}
|
|
|
|
func (m *mockedModel) Completion(device protocol.DeviceID, folder string) model.FolderCompletion {
|
|
return model.FolderCompletion{}
|
|
}
|
|
|
|
func (m *mockedModel) Override(folder string) {}
|
|
|
|
func (m *mockedModel) NeedFolderFiles(folder string, page, perpage int) ([]db.FileInfoTruncated, []db.FileInfoTruncated, []db.FileInfoTruncated, int) {
|
|
return nil, nil, nil, 0
|
|
}
|
|
|
|
func (m *mockedModel) NeedSize(folder string) db.Counts {
|
|
return db.Counts{}
|
|
}
|
|
|
|
func (m *mockedModel) ConnectionStats() map[string]interface{} {
|
|
return nil
|
|
}
|
|
|
|
func (m *mockedModel) DeviceStatistics() map[string]stats.DeviceStatistics {
|
|
return nil
|
|
}
|
|
|
|
func (m *mockedModel) FolderStatistics() map[string]stats.FolderStatistics {
|
|
return nil
|
|
}
|
|
|
|
func (m *mockedModel) CurrentFolderFile(folder string, file string) (protocol.FileInfo, bool) {
|
|
return protocol.FileInfo{}, false
|
|
}
|
|
|
|
func (m *mockedModel) CurrentGlobalFile(folder string, file string) (protocol.FileInfo, bool) {
|
|
return protocol.FileInfo{}, false
|
|
}
|
|
|
|
func (m *mockedModel) ResetFolder(folder string) {
|
|
}
|
|
|
|
func (m *mockedModel) Availability(folder, file string, version protocol.Vector, block protocol.BlockInfo) []model.Availability {
|
|
return nil
|
|
}
|
|
|
|
func (m *mockedModel) GetIgnores(folder string) ([]string, []string, error) {
|
|
return nil, nil, nil
|
|
}
|
|
|
|
func (m *mockedModel) SetIgnores(folder string, content []string) error {
|
|
return nil
|
|
}
|
|
|
|
func (m *mockedModel) PauseDevice(device protocol.DeviceID) {
|
|
}
|
|
|
|
func (m *mockedModel) ResumeDevice(device protocol.DeviceID) {}
|
|
|
|
func (m *mockedModel) DelayScan(folder string, next time.Duration) {}
|
|
|
|
func (m *mockedModel) ScanFolder(folder string) error {
|
|
return nil
|
|
}
|
|
|
|
func (m *mockedModel) ScanFolders() map[string]error {
|
|
return nil
|
|
}
|
|
|
|
func (m *mockedModel) ScanFolderSubdirs(folder string, subs []string) error {
|
|
return nil
|
|
}
|
|
|
|
func (m *mockedModel) BringToFront(folder, file string) {}
|
|
|
|
func (m *mockedModel) Connection(deviceID protocol.DeviceID) (connections.Connection, bool) {
|
|
return nil, false
|
|
}
|
|
|
|
func (m *mockedModel) GlobalSize(folder string) db.Counts {
|
|
return db.Counts{}
|
|
}
|
|
|
|
func (m *mockedModel) LocalSize(folder string) db.Counts {
|
|
return db.Counts{}
|
|
}
|
|
|
|
func (m *mockedModel) CurrentSequence(folder string) (int64, bool) {
|
|
return 0, false
|
|
}
|
|
|
|
func (m *mockedModel) RemoteSequence(folder string) (int64, bool) {
|
|
return 0, false
|
|
}
|
|
|
|
func (m *mockedModel) State(folder string) (string, time.Time, error) {
|
|
return "", time.Time{}, nil
|
|
}
|
|
|
|
func (m *mockedModel) UsageReportingStats(version int, preview bool) map[string]interface{} {
|
|
return nil
|
|
}
|