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

lib/model: Don't info log repeat pull errors (#6149)

Browse Source
This commit is contained in:
Simon Frei
2019-11-19 09:56:53 +01:00
committed by GitHub
parent 28edf2f5bb
commit 0d14ee4142
10 changed files with 77 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/protocol/wireformat.go
View File

@@ -3,6 +3,7 @@
package protocol
import (
"context"
"path/filepath"
"golang.org/x/text/unicode/norm"
@@ -34,7 +35,7 @@ func (c wireFormatConnection) IndexUpdate(folder string, fs []FileInfo) error {
return c.Connection.IndexUpdate(folder, myFs)
}
func (c wireFormatConnection) Request(folder, name string, offset int64, size int, hash []byte, weakHash uint32, fromTemporary bool) ([]byte, error) {
func (c wireFormatConnection) Request(ctx context.Context, folder string, name string, offset int64, size int, hash []byte, weakHash uint32, fromTemporary bool) ([]byte, error) {
name = norm.NFC.String(filepath.ToSlash(name))
return c.Connection.Request(folder, name, offset, size, hash, weakHash, fromTemporary)
return c.Connection.Request(ctx, folder, name, offset, size, hash, weakHash, fromTemporary)
}