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

lib/model: Centralize error reporting, modified files are errors (fixes #4392)

Browse Source
This commit is contained in:
Audrius Butkevicius
2017-09-23 15:22:26 +01:00
committed by Jakob Borg
parent 5ec1490be0
commit 74c8d34805
2 changed files with 30 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/model/sharedpullerstate.go
View File

@@ -7,6 +7,7 @@
package model
import (
"fmt"
"io"
"path/filepath"
"time"
@@ -204,9 +205,8 @@ func (s *sharedPullerState) sourceFile() (fs.File, error) {
return fd, nil
}
// earlyClose prints a warning message composed of the context and
// error, and marks the sharedPullerState as failed. Is a no-op when called on
// an already failed state.
// fail sets the error on the puller state compose of error, and marks the
// sharedPullerState as failed. Is a no-op when called on an already failed state.
func (s *sharedPullerState) fail(context string, err error) {
s.mut.Lock()
defer s.mut.Unlock()
@@ -215,12 +215,11 @@ func (s *sharedPullerState) fail(context string, err error) {
}
func (s *sharedPullerState) failLocked(context string, err error) {
if s.err != nil {
if s.err != nil || err == nil {
return
}
l.Infof("Puller (folder %q, file %q): %s: %v", s.folder, s.file.Name, context, err)
s.err = err
s.err = fmt.Errorf("%s: %s", context, err.Error())
}
func (s *sharedPullerState) failed() error {