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

Fix scan interval for slow scans

Browse Source
This commit is contained in:
Jakob Borg 2014-07-17 13:39:04 +02:00
parent f88a7a8e6a
commit 0a804e39a8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
model/puller.go
View File

@ -127,9 +127,10 @@ func (p *puller) run() {
} }
}() }()
walkTicker := time.Tick(time.Duration(p.cfg.Options.RescanIntervalS) * time.Second)
timeout := time.Tick(5 * time.Second) timeout := time.Tick(5 * time.Second)
changed := true changed := true
scanintv := time.Duration(p.cfg.Options.RescanIntervalS) * time.Second
lastscan := time.Now()
var prevVer uint64 var prevVer uint64
for { for {
@ -179,18 +180,17 @@ func (p *puller) run() {
p.model.setState(p.repoCfg.ID, RepoIdle) p.model.setState(p.repoCfg.ID, RepoIdle)
// Do a rescan if it's time for it // Do a rescan if it's time for it
select { if time.Since(lastscan) > scanintv {
case <-walkTicker:
if debug { if debug {
l.Debugf("%q: time for rescan", p.repoCfg.ID) l.Debugf("%q: time for rescan", p.repoCfg.ID)
} }
err := p.model.ScanRepo(p.repoCfg.ID) err := p.model.ScanRepo(p.repoCfg.ID)
if err != nil { if err != nil {
invalidateRepo(p.cfg, p.repoCfg.ID, err) invalidateRepo(p.cfg, p.repoCfg.ID, err)
return return
} }
lastscan = time.Now()
default:
} }
if v := p.model.LocalVersion(p.repoCfg.ID); v > prevVer { if v := p.model.LocalVersion(p.repoCfg.ID); v > prevVer {