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

Only check pull file size if check is enabled (ref #2241)

Browse Source
This commit is contained in:
Jakob Borg 2015-09-06 17:11:51 +02:00
parent b2193b23e5
commit e26e85b6d6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/model/rwfolder.go
View File

@ -511,7 +511,7 @@ func (p *rwFolder) pullerIteration(ignores *ignore.Matcher) int {
// Check if we are able to store all files on disk. Only perform this // Check if we are able to store all files on disk. Only perform this
// check if there is a minimum free space threshold set on the folder. // check if there is a minimum free space threshold set on the folder.
folderCfg := p.model.cfg.Folders()[p.folder] folderCfg := p.model.cfg.Folders()[p.folder]
if folderCfg.MinDiskFreePct > 0 || pullFileSize > 0 { if folderCfg.MinDiskFreePct > 0 && pullFileSize > 0 {
if free, err := osutil.DiskFreeBytes(folderCfg.Path()); err == nil && free < pullFileSize { if free, err := osutil.DiskFreeBytes(folderCfg.Path()); err == nil && free < pullFileSize {
l.Warnf(`Folder "%s": insufficient disk space available to pull %d files (%.2f MiB)`, p.folder, changed, float64(pullFileSize)/1024/1024) l.Warnf(`Folder "%s": insufficient disk space available to pull %d files (%.2f MiB)`, p.folder, changed, float64(pullFileSize)/1024/1024)
return 0 return 0