1
0
mirror of https://github.com/haiwen/seafile-server.git synced 2025-09-05 09:20:13 +00:00

Clean go unused log (#579)

Co-authored-by: 杨赫然 <heran.yang@seafile.com>
This commit is contained in:
feiniks
2022-10-14 12:10:53 +08:00
committed by GitHub
parent 04350f2b99
commit 620438fbb5
4 changed files with 18 additions and 18 deletions

View File

@@ -6,6 +6,7 @@ import (
"database/sql"
"encoding/binary"
"encoding/json"
"errors"
"fmt"
"html"
"io/ioutil"
@@ -156,8 +157,13 @@ func getFsId(args ...interface{}) error {
}
ret, err := calculateSendObjectList(r.Context(), repo, serverHead, clientHead, dirOnly)
if err != nil {
err := fmt.Errorf("Failed to get fs id list: %v", err)
appErr := &appError{err, "", http.StatusInternalServerError}
if !errors.Is(err, context.Canceled) {
err := fmt.Errorf("Failed to get fs id list: %w", err)
appErr := &appError{err, "", http.StatusInternalServerError}
resChan <- &calResult{user, appErr}
return nil
}
appErr := &appError{nil, "", http.StatusInternalServerError}
resChan <- &calResult{user, appErr}
return nil
}
@@ -1285,7 +1291,7 @@ func calculateSendObjectList(ctx context.Context, repo *repomgr.Repo, serverHead
func collectFileIDs(ctx context.Context, baseDir string, files []*fsmgr.SeafDirent, data interface{}) error {
select {
case <-ctx.Done():
return fmt.Errorf("request canceled")
return context.Canceled
default:
}
@@ -1313,7 +1319,7 @@ func collectFileIDsNOp(ctx context.Context, baseDir string, files []*fsmgr.SeafD
func collectDirIDs(ctx context.Context, baseDir string, dirs []*fsmgr.SeafDirent, data interface{}, recurse *bool) error {
select {
case <-ctx.Done():
return fmt.Errorf("request canceled")
return context.Canceled
default:
}