Browse Source

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

Jakob Borg 6 years ago
parent
commit
24d4290d03
3 changed files with 6 additions and 5 deletions
  1. 1 0
      lib/model/folder.go
  2. 2 2
      lib/scanner/walk.go
  3. 3 3
      lib/scanner/walk_test.go

+ 1 - 0
lib/model/folder.go

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

+ 2 - 2
lib/scanner/walk.go

@@ -57,7 +57,7 @@ type Config struct {
 	// Modification time is to be considered unchanged if the difference is lower.
 	ModTimeWindow time.Duration
 	// Event logger to which the scan progress events are sent
-	EvLogger events.Logger
+	EventLogger events.Logger
 }
 
 type CurrentFiler interface {
@@ -170,7 +170,7 @@ func (w *walker) walk(ctx context.Context) chan ScanResult {
 					current := progress.Total()
 					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)
-					w.EvLogger.Log(events.FolderScanProgress, map[string]interface{}{
+					w.EventLogger.Log(events.FolderScanProgress, map[string]interface{}{
 						"folder":  w.Folder,
 						"current": current,
 						"total":   total,

+ 3 - 3
lib/scanner/walk_test.go

@@ -788,8 +788,8 @@ func testConfig() Config {
 	evLogger := events.NewLogger()
 	go evLogger.Serve()
 	return Config{
-		Filesystem: testFs,
-		Hashers:    2,
-		EvLogger:   evLogger,
+		Filesystem:  testFs,
+		Hashers:     2,
+		EventLogger: evLogger,
 	}
 }