Mirrors/sftpgo
1
0
Fork 0
mirror of https://github.com/drakkan/sftpgo.git synced 2025-12-08 15:28:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

restored the log if retrieving directory entries fails

Browse Source 
Signed-off-by: Nicola Murino <nicola.murino@gmail.com>
This commit is contained in:
Nicola Murino
2024-03-12 18:31:01 +01:00
parent 26d3105f54
commit 55c8677443
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
internal/common/connection.go
View File

@@ -314,6 +314,8 @@ func (c *BaseConnection) ListDir(virtualPath string) (*DirListerAt, error) {
virtualPath: virtualPath, virtualPath: virtualPath,
user: &c.User, user: &c.User,
info: c.User.GetVirtualFoldersInfo(virtualPath), info: c.User.GetVirtualFoldersInfo(virtualPath),
id: c.ID,
protocol: c.protocol,
lister: lister, lister: lister,
}, nil }, nil
} }
@@ -1801,6 +1803,8 @@ type DirListerAt struct {
virtualPath string virtualPath string
user *dataprovider.User user *dataprovider.User
info []os.FileInfo info []os.FileInfo
id string
protocol string
mu sync.Mutex mu sync.Mutex
lister vfs.DirLister lister vfs.DirLister
} }
@@ -1843,6 +1847,7 @@ func (l *DirListerAt) Next(limit int) ([]os.FileInfo, error) {
for { for {
files, err := l.lister.Next(limit) files, err := l.lister.Next(limit)
if err != nil && !errors.Is(err, io.EOF) { if err != nil && !errors.Is(err, io.EOF) {
logger.Debug(l.protocol, l.id, "error retrieving directory entries: %+v", err)
return files, err return files, err
} }
files = l.user.FilterListDir(files, l.virtualPath) files = l.user.FilterListDir(files, l.virtualPath)