perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor config into separate package

Browse Source
This commit is contained in:
Jakob Borg
2014-05-14 21:18:09 -03:00
parent cba554d0fa
commit f8e34c083e
6 changed files with 37 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/syncthing/puller.go
View File

@@ -9,6 +9,7 @@ import (
"github.com/calmh/syncthing/buffers"
"github.com/calmh/syncthing/cid"
"github.com/calmh/syncthing/config"
"github.com/calmh/syncthing/protocol"
"github.com/calmh/syncthing/scanner"
)
@@ -175,7 +176,7 @@ func (p *puller) run() {
}
err := p.model.ScanRepo(p.repo)
if err != nil {
invalidateRepo(p.repo, err)
invalidateRepo(cfg, p.repo, err)
return
}
@@ -196,7 +197,7 @@ func (p *puller) runRO() {
}
err := p.model.ScanRepo(p.repo)
if err != nil {
invalidateRepo(p.repo, err)
invalidateRepo(cfg, p.repo, err)
return
}
}
@@ -562,3 +563,13 @@ func (p *puller) closeFile(f scanner.File) {
l.Debugf("pull: error: %q / %q: %v", p.repo, f.Name, err)
}
}
func invalidateRepo(cfg config.Configuration, repoID string, err error) {
for i := range cfg.Repositories {
repo := &cfg.Repositories[i]
if repo.ID == repoID {
repo.Invalid = err.Error()
return
}
}
}