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

lib/model, lib/scanner: Pass a valid event logger (fixes #5970) (#5971)

Browse Source
This commit is contained in:
Jakob Borg 2019-08-21 08:05:43 +02:00 committed by Simon Frei
parent 09b872cef4
commit 24d4290d03
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/model/folder.go
View File

@ -348,6 +348,7 @@ func (f *folder) scanSubdirs(subDirs []string) error {
ProgressTickIntervalS: f.ScanProgressIntervalS, ProgressTickIntervalS: f.ScanProgressIntervalS,
LocalFlags: f.localFlags, LocalFlags: f.localFlags,
ModTimeWindow: f.ModTimeWindow(), ModTimeWindow: f.ModTimeWindow(),
EventLogger: f.evLogger,
}) })
batchFn := func(fs []protocol.FileInfo) error { batchFn := func(fs []protocol.FileInfo) error {

4
lib/scanner/walk.go
View File

@ -57,7 +57,7 @@ type Config struct {
// Modification time is to be considered unchanged if the difference is lower. // Modification time is to be considered unchanged if the difference is lower.
ModTimeWindow time.Duration ModTimeWindow time.Duration
// Event logger to which the scan progress events are sent // Event logger to which the scan progress events are sent
EvLogger events.Logger EventLogger events.Logger
} }
type CurrentFiler interface { type CurrentFiler interface {
@ -170,7 +170,7 @@ func (w *walker) walk(ctx context.Context) chan ScanResult {
current := progress.Total() current := progress.Total()
rate := progress.Rate() rate := progress.Rate()
l.Debugf("Walk %s %s current progress %d/%d at %.01f MiB/s (%d%%)", w.Folder, w.Subs, current, total, rate/1024/1024, current*100/total) l.Debugf("Walk %s %s current progress %d/%d at %.01f MiB/s (%d%%)", w.Folder, w.Subs, current, total, rate/1024/1024, current*100/total)
w.EvLogger.Log(events.FolderScanProgress, map[string]interface{}{ w.EventLogger.Log(events.FolderScanProgress, map[string]interface{}{
"folder": w.Folder, "folder": w.Folder,
"current": current, "current": current,
"total": total, "total": total,

2
lib/scanner/walk_test.go
View File

@ -790,6 +790,6 @@ func testConfig() Config {
return Config{ return Config{
Filesystem: testFs, Filesystem: testFs,
Hashers: 2, Hashers: 2,
EvLogger: evLogger, EventLogger: evLogger,
} }
} }