Browse Source

Merge pull request 'fix high cpu' (#63) from fix-cpu into develop

Reviewed-by: berry <senluowanxiangt@gmail.com>
master
berry 4 years ago
parent
commit
a1c6a2fbb0
2 changed files with 19 additions and 3 deletions
  1. +19
    -2
      routers/repo/dir.go
  2. +0
    -1
      web_src/js/components/MinioUploader.vue

+ 19
- 2
routers/repo/dir.go View File

@@ -2,8 +2,9 @@ package repo

import (
"errors"
"io/ioutil"
"os"
"path"
"sort"
"strings"

"code.gitea.io/gitea/models"
@@ -52,7 +53,7 @@ func DirIndex(ctx *context.Context) {
dirArray = []string{attachment.Name}
}

files, err := ioutil.ReadDir(setting.Attachment.Minio.RealPath + setting.Attachment.Minio.Bucket + "/" + setting.Attachment.Minio.BasePath +
files, err := readDir(setting.Attachment.Minio.RealPath + setting.Attachment.Minio.Bucket + "/" + setting.Attachment.Minio.BasePath +
path.Join(uuid[0:1], uuid[1:2], uuid+uuid) + "/" + parentDir)
if err != nil {
log.Error("ReadDir failed:", err.Error())
@@ -93,3 +94,19 @@ func DirIndex(ctx *context.Context) {

ctx.HTML(200, tplDirIndex)
}

// readDir reads the directory named by dirname and returns
// a list of directory entries sorted by filename.
func readDir(dirname string) ([]os.FileInfo, error) {
f, err := os.Open(dirname)
if err != nil {
return nil, err
}
list, err := f.Readdir(100)
f.Close()
if err != nil {
return nil, err
}
sort.Slice(list, func(i, j int) bool { return list[i].Name() < list[j].Name() })
return list, nil
}

+ 0
- 1
web_src/js/components/MinioUploader.vue View File

@@ -315,7 +315,6 @@ export default {
_csrf: csrf
}
});
console.log('getUploadChunkUrl: ', res);
urls[currentChunk] = res.data.url;
}



Loading…
Cancel
Save