haiwen/seafile-server
1
0
Fork 0
mirror of https://github.com/haiwen/seafile-server.git synced 2025-09-05 01:11:05 +00:00
Code Issues Releases Wiki Activity

Clean go unused log (#579)

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
fileserver/diff/diff.go
View File

@@ -154,7 +154,7 @@ func diffDirectories(baseDir string, dents []*fsmgr.SeafDirent, opt *DiffOptions
recurse := true
err := opt.DirCB(opt.Ctx, baseDir, dirs, opt.Data, &recurse)
if err != nil {
err := fmt.Errorf("failed to call dir callback: %v", err)
err := fmt.Errorf("failed to call dir callback: %w", err)
return err
}

8
fileserver/fileop.go
View File

@@ -264,7 +264,6 @@ func doFile(rsp http.ResponseWriter, r *http.Request, repo *repomgr.Repo, fileID
}
_, err = rsp.Write(decoded)
if err != nil {
log.Printf("failed to write block %s to response: %v", blkID, err)
return nil
}
}
@@ -398,10 +397,7 @@ func doFileRange(rsp http.ResponseWriter, r *http.Request, repo *repomgr.Repo, f
return nil
}
recvBuf := buf.Bytes()
_, err = rsp.Write(recvBuf[pos : pos+end-start+1])
if err != nil {
log.Printf("failed to write block %s to response: %v", blkID, err)
}
rsp.Write(recvBuf[pos : pos+end-start+1])
return nil
}
@@ -415,7 +411,6 @@ func doFileRange(rsp http.ResponseWriter, r *http.Request, repo *repomgr.Repo, f
recvBuf := buf.Bytes()
_, err = rsp.Write(recvBuf[pos:])
if err != nil {
log.Printf("failed to write block %s to response: %v", blkID, err)
return nil
}
start += blkSize[i] - pos
@@ -438,7 +433,6 @@ func doFileRange(rsp http.ResponseWriter, r *http.Request, repo *repomgr.Repo, f
recvBuf := buf.Bytes()
_, err = rsp.Write(recvBuf[:end-start+1])
if err != nil {
log.Printf("failed to write block %s to response: %v", blkID, err)
return nil
}
break

12
fileserver/sync_api.go
View File

@@ -6,6 +6,7 @@ import (
"database/sql"
"encoding/binary"
"encoding/json"
"errors"
"fmt"
"html"
"io/ioutil"
@@ -156,11 +157,16 @@ 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)
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
}
var objList []byte
if ret != 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:
}

12
fileserver/virtual_repo.go
View File

@@ -119,14 +119,14 @@ func mergeRepo(repoID string) error {
}
origHead, err := commitmgr.Load(origRepo.ID, origRepo.HeadCommitID)
if err != nil {
err := fmt.Errorf("failed to get commit %s:%.8s", origRepo.ID, origRepo.HeadCommitID)
err := fmt.Errorf("merge repo %.8s failed: failed to get origin repo commit %s:%.8s", repoID, origRepo.ID, origRepo.HeadCommitID)
return err
}
var origRoot string
origRoot, err = fsmgr.GetSeafdirIDByPath(origRepo.StoreID, origHead.RootID, vInfo.Path)
if err != nil && !errors.Is(err, fsmgr.ErrPathNoExist) {
err := fmt.Errorf("failed to get seafdir id by path in origin repo %.10s: %v", origRepo.StoreID, err)
err := fmt.Errorf("merge repo %.10s failed: failed to get seafdir id by path in origin repo %.10s: %v", repoID, origRepo.StoreID, err)
return err
}
if origRoot == "" {
@@ -141,14 +141,14 @@ func mergeRepo(repoID string) error {
base, err := commitmgr.Load(origRepo.ID, vInfo.BaseCommitID)
if err != nil {
err := fmt.Errorf("failed to get commit %s:%.8s", origRepo.ID, vInfo.BaseCommitID)
err := fmt.Errorf("merge repo %.8s failed: failed to get origin repo commit %s:%.8s", repoID, origRepo.ID, vInfo.BaseCommitID)
return err
}
root := head.RootID
baseRoot, _ := fsmgr.GetSeafdirIDByPath(origRepo.StoreID, base.RootID, vInfo.Path)
if baseRoot == "" {
err := fmt.Errorf("cannot find seafdir for repo %.10s path %s", vInfo.OriginRepoID, vInfo.Path)
err := fmt.Errorf("merge repo %.10s failed: cannot find seafdir for origin repo %.10s path %s", repoID, vInfo.OriginRepoID, vInfo.Path)
return err
}
@@ -163,7 +163,7 @@ func mergeRepo(repoID string) error {
} else if baseRoot == origRoot {
newBaseCommit, err := updateDir(vInfo.OriginRepoID, vInfo.Path, root, head.CreatorName, origHead.CommitID)
if err != nil {
err := fmt.Errorf("failed to update origin repo%.10s path %s", vInfo.OriginRepoID, vInfo.Path)
err := fmt.Errorf("merge repo %.8s failed: failed to update origin repo%.10s path %s", repoID, vInfo.OriginRepoID, vInfo.Path)
return err
}
repomgr.SetVirtualRepoBaseCommitPath(repo.ID, newBaseCommit, vInfo.Path)
@@ -189,7 +189,7 @@ func mergeRepo(repoID string) error {
newBaseCommit, err := updateDir(vInfo.OriginRepoID, vInfo.Path, opt.mergedRoot, head.CreatorName, origHead.CommitID)
if err != nil {
err := fmt.Errorf("failed to update origin repo %.10s path %s", vInfo.OriginRepoID, vInfo.Path)
err := fmt.Errorf("merge repo %.10s failed: failed to update origin repo %.10s path %s", repoID, vInfo.OriginRepoID, vInfo.Path)
return err
}
repomgr.SetVirtualRepoBaseCommitPath(repo.ID, newBaseCommit, vInfo.Path)