IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

shared/filestore/localstore.go: remove unnecessary warning (#25801)

Browse Source
This commit is contained in:
Ibrahim Serdar Acikgoz
2023-12-22 19:26:57 +01:00
committed by GitHub
parent 0496483a9e
commit 0f3553c8ab
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/platform/shared/filestore/filesstore_test.go
View File

@@ -391,7 +391,7 @@ func (s *FileBackendTestSuite) TestListDirectoryRecursively() {
b := []byte("test")
path1 := "19700101/" + randomString()
path2 := "19800101/" + randomString()
longPath := "19800102/this/is/a/way/too/long/path/for/this/function/to/handle" + randomString()
longPath := "19800102" + strings.Repeat("/toomuch", MaxRecursionDepth+1) + randomString()
paths, err := s.backend.ListDirectoryRecursively("19700101")
s.Nil(err)

24
server/platform/shared/filestore/localstore.go
View File

@@ -16,7 +16,8 @@ import (
)
const (
TestFilePath = "/testfile"
TestFilePath = "/testfile"
MaxRecursionDepth = 50
)
type LocalFileBackend struct {
@@ -211,7 +212,7 @@ func appendRecursively(basePath, path string, maxDepth int) ([]string, error) {
}
if dirEntry.IsDir() {
if maxDepth <= 0 {
mlog.Warn("Max Depth reached", mlog.String("path", entryPath))
mlog.Warn("Max depth reached, skipping any further directories", mlog.Int("depth", maxDepth), mlog.String("path", entryPath))
results = append(results, entryPath)
continue // we'll ignore it if max depth is reached.
}
@@ -228,11 +229,26 @@ func appendRecursively(basePath, path string, maxDepth int) ([]string, error) {
}
func (b *LocalFileBackend) ListDirectory(path string) ([]string, error) {
return appendRecursively(b.directory, path, 0)
results := []string{}
dirEntries, err := os.ReadDir(filepath.Join(b.directory, path))
if err != nil {
if os.IsNotExist(err) {
// ideally os.ErrNotExist should've been returned but to keep the
// consistency, leaving it as is before.
return results, nil
}
// same here, ideally we shouldn't return the empty slice
return results, errors.Wrapf(err, "unable to list the directory %s", path)
}
for _, dirEntry := range dirEntries {
results = append(results, filepath.Join(path, dirEntry.Name()))
}
return results, nil
}
func (b *LocalFileBackend) ListDirectoryRecursively(path string) ([]string, error) {
return appendRecursively(b.directory, path, 10)
return appendRecursively(b.directory, path, MaxRecursionDepth)
}
func (b *LocalFileBackend) RemoveDirectory(path string) error {