all: Display fs watcher status and retry starting it (ref #4552) (#4713)

This commit is contained in:
Simon Frei
2018-02-04 22:46:24 +01:00
committed by Jakob Borg
parent 649d4cf7b0
commit f87f13081b
6 changed files with 122 additions and 25 deletions

View File

@@ -65,6 +65,7 @@ type service interface {
Stop()
CheckHealth() error
PullErrors() []FileError
WatchError() error
getState() (folderState, time.Time, error)
setState(state folderState)
@@ -2213,6 +2214,15 @@ func (m *Model) PullErrors(folder string) ([]FileError, error) {
return m.folderRunners[folder].PullErrors(), nil
}
func (m *Model) WatchError(folder string) error {
m.fmut.RLock()
defer m.fmut.RUnlock()
if err := m.checkFolderRunningLocked(folder); err != nil {
return err
}
return m.folderRunners[folder].WatchError()
}
func (m *Model) Override(folder string) {
m.fmut.RLock()
fs, ok := m.folderFiles[folder]