From 6ec4fbc82bae3fd0c70253fd6805c9ef3ef2a119 Mon Sep 17 00:00:00 2001 From: Audrius Butkevicius Date: Tue, 16 Aug 2016 18:22:01 +0000 Subject: [PATCH] lib/model: Add minumum interval for progress emitter (fixes #3517) GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3518 --- lib/model/progressemitter.go | 3 +++ lib/model/progressemitter_test.go | 1 + 2 files changed, 4 insertions(+) diff --git a/lib/model/progressemitter.go b/lib/model/progressemitter.go index 0e961257b..9c35b0af8 100755 --- a/lib/model/progressemitter.go +++ b/lib/model/progressemitter.go @@ -190,6 +190,9 @@ func (t *ProgressEmitter) CommitConfiguration(from, to config.Configuration) boo defer t.mut.Unlock() t.interval = time.Duration(to.Options.ProgressUpdateIntervalS) * time.Second + if t.interval < time.Second { + t.interval = time.Second + } t.minBlocks = to.Options.TempIndexMinBlocks l.Debugln("progress emitter: updated interval", t.interval) diff --git a/lib/model/progressemitter_test.go b/lib/model/progressemitter_test.go index 731c84aa8..595d12873 100644 --- a/lib/model/progressemitter_test.go +++ b/lib/model/progressemitter_test.go @@ -60,6 +60,7 @@ func TestProgressEmitter(t *testing.T) { p := NewProgressEmitter(c) go p.Serve() + p.interval = 0 expectTimeout(w, t)