lib/model: Add minumum interval for progress emitter (fixes #3517)
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3518
This commit is contained in:
parent
18cc7a663b
commit
6ec4fbc82b
|
@ -190,6 +190,9 @@ func (t *ProgressEmitter) CommitConfiguration(from, to config.Configuration) boo
|
||||||
defer t.mut.Unlock()
|
defer t.mut.Unlock()
|
||||||
|
|
||||||
t.interval = time.Duration(to.Options.ProgressUpdateIntervalS) * time.Second
|
t.interval = time.Duration(to.Options.ProgressUpdateIntervalS) * time.Second
|
||||||
|
if t.interval < time.Second {
|
||||||
|
t.interval = time.Second
|
||||||
|
}
|
||||||
t.minBlocks = to.Options.TempIndexMinBlocks
|
t.minBlocks = to.Options.TempIndexMinBlocks
|
||||||
l.Debugln("progress emitter: updated interval", t.interval)
|
l.Debugln("progress emitter: updated interval", t.interval)
|
||||||
|
|
||||||
|
|
|
@ -60,6 +60,7 @@ func TestProgressEmitter(t *testing.T) {
|
||||||
|
|
||||||
p := NewProgressEmitter(c)
|
p := NewProgressEmitter(c)
|
||||||
go p.Serve()
|
go p.Serve()
|
||||||
|
p.interval = 0
|
||||||
|
|
||||||
expectTimeout(w, t)
|
expectTimeout(w, t)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue