mirror of
https://github.com/octoleo/syncthing.git
synced 2024-11-10 07:11:08 +00:00
6b188ebcf3
The mechanism to disallow manual scans before the initial scan completed (#3996) , had the side effect, that if the initial scan failed, no further scans are allowed. So this marks the initial scan as finished regardless of whether it succeeded or not. There was also redundant code in rofolder and a pointless check for folder health in scanSubsIfHealthy (happens in internalScanFolderSubdirs as well). This also moves logging from folder.go to ro/rw-folder.go to include the information about whether it is send-only or send-receive GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4104
85 lines
1.8 KiB
Go
85 lines
1.8 KiB
Go
// Copyright (C) 2014 The Syncthing Authors.
|
|
//
|
|
// This Source Code Form is subject to the terms of the Mozilla Public
|
|
// License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
|
// You can obtain one at https://mozilla.org/MPL/2.0/.
|
|
|
|
package model
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/syncthing/syncthing/lib/config"
|
|
"github.com/syncthing/syncthing/lib/fs"
|
|
"github.com/syncthing/syncthing/lib/versioner"
|
|
)
|
|
|
|
func init() {
|
|
folderFactories[config.FolderTypeSendOnly] = newSendOnlyFolder
|
|
}
|
|
|
|
type sendOnlyFolder struct {
|
|
folder
|
|
config.FolderConfiguration
|
|
}
|
|
|
|
func newSendOnlyFolder(model *Model, cfg config.FolderConfiguration, _ versioner.Versioner, _ *fs.MtimeFS) service {
|
|
return &sendOnlyFolder{
|
|
folder: folder{
|
|
stateTracker: newStateTracker(cfg.ID),
|
|
scan: newFolderScanner(cfg),
|
|
stop: make(chan struct{}),
|
|
model: model,
|
|
initialScanFinished: make(chan struct{}),
|
|
},
|
|
FolderConfiguration: cfg,
|
|
}
|
|
}
|
|
|
|
func (f *sendOnlyFolder) Serve() {
|
|
l.Debugln(f, "starting")
|
|
defer l.Debugln(f, "exiting")
|
|
|
|
defer func() {
|
|
f.scan.timer.Stop()
|
|
}()
|
|
|
|
for {
|
|
select {
|
|
case <-f.stop:
|
|
return
|
|
|
|
case <-f.scan.timer.C:
|
|
l.Debugln(f, "Scanning subdirectories")
|
|
err := f.scanSubdirs(nil)
|
|
|
|
select {
|
|
case <-f.initialScanFinished:
|
|
default:
|
|
status := "Completed"
|
|
if err != nil {
|
|
status = "Failed"
|
|
}
|
|
l.Infoln(status, "initial scan (ro) of", f.Description())
|
|
close(f.initialScanFinished)
|
|
}
|
|
|
|
if f.scan.HasNoInterval() {
|
|
continue
|
|
}
|
|
|
|
f.scan.Reschedule()
|
|
|
|
case req := <-f.scan.now:
|
|
req.err <- f.scanSubdirs(req.subdirs)
|
|
|
|
case next := <-f.scan.delay:
|
|
f.scan.timer.Reset(next)
|
|
}
|
|
}
|
|
}
|
|
|
|
func (f *sendOnlyFolder) String() string {
|
|
return fmt.Sprintf("sendOnlyFolder/%s@%p", f.folderID, f)
|
|
}
|