fork of https://github.com/sourcegraph/zoekt
Merge remote-tracking branch 'gerrit/master'
Change-Id: I2a4c92c9175cf1c1347f2faf8cfba1c998d8baac
author
Keegan Carruthers-Smith
date
(Jun 2, 2020, 2:11 PM +0200)
commit
a07da6dd
a07da6dd6bf0fa1787afe1f082a43b5af1046b2c
parent
b56036a3
b56036a3b745033badc48807bd67e91cd8d73bdf
+19
-2
+19
-2
shards/watcher.go
+19
-2
shards/watcher.go
···
174
174
return err
175
175
}
176
176
177
+
// intermediate signal channel so if there are multiple watcher.Events we
178
+
// only call scan once.
179
+
signal := make(chan struct{}, 1)
180
+
177
181
go func() {
178
182
for {
179
183
select {
180
184
case <-watcher.Events:
181
-
s.scan()
185
+
select {
186
+
case signal <- struct{}{}:
187
+
default:
188
+
}
182
189
case err := <-watcher.Errors:
183
-
if err != nil {
190
+
// Ignore ErrEventOverflow since we rely on the presence of events so
191
+
// safe to ignore.
192
+
if err != nil && err != fsnotify.ErrEventOverflow {
184
193
log.Println("watcher error:", err)
185
194
}
186
195
case <-quitter:
187
196
watcher.Close()
197
+
close(signal)
188
198
return
189
199
}
190
200
}
191
201
}()
202
+
203
+
go func() {
204
+
for range signal {
205
+
s.scan()
206
+
}
207
+
}()
208
+
192
209
return nil
193
210
}