mirrors/versitygw
1
0
Fork 0
mirror of https://github.com/versity/versitygw.git synced 2026-08-19 21:56:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Branch up to date

Browse Source
This commit is contained in:
jonaustin09
2023-06-14 22:41:44 +04:00
parent 21f0fea5a7 6abafe2169
commit 114d9fdf63
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/posix/posix_linux.go
+3 -2
View File
@@ -68,7 +68,7 @@ func openTmpFile(dir, bucket, obj string, size int64) (*tmpfile, error) {
// later to link file into namespace
f := os.NewFile(uintptr(fd), filepath.Join(procfddir, strconv.Itoa(fd)))
tmp := &tmpfile{f: f, isOTmp: true, size: size}
tmp := &tmpfile{f: f, bucket: bucket, objname: obj, isOTmp: true, size: size}
// falloc is best effort, its fine if this fails
if size > 0 {
tmp.falloc()
@@ -117,7 +117,8 @@ func (tmp *tmpfile) link() error {
err = unix.Linkat(int(procdir.Fd()), filepath.Base(tmp.f.Name()),
int(dir.Fd()), filepath.Base(objPath), unix.AT_SYMLINK_FOLLOW)
if err != nil {
return fmt.Errorf("link tmpfile: %w", err)
return fmt.Errorf("link tmpfile (%q in %q): %w",
filepath.Dir(objPath), filepath.Base(tmp.f.Name()), err)
}
err = tmp.f.Close()
s3api/controllers/base.go
+4 -4
View File
@@ -428,8 +428,8 @@ func SendResponse(ctx *fiber.Ctx, err error) error {
return ctx.Send(s3err.GetAPIErrorResponse(serr, "", "", ""))
}
fmt.Fprintf(os.Stderr, "Internal Error, req:\n%v\nerr:\n%v\n",
ctx.Request(), err)
fmt.Fprintf(os.Stderr, "Internal Error, req:\n%v\nerr: %v\n",
ctx.Request().Header.String(), err)
return ctx.Send(s3err.GetAPIErrorResponse(
s3err.GetAPIError(s3err.ErrInternalError), "", "", ""))
@@ -449,8 +449,8 @@ func SendXMLResponse(ctx *fiber.Ctx, resp any, err error) error {
return ctx.Send(s3err.GetAPIErrorResponse(serr, "", "", ""))
}
fmt.Fprintf(os.Stderr, "Internal Error, req:\n%v\nerr:\n%v\n",
ctx.Request(), err)
fmt.Fprintf(os.Stderr, "Internal Error, req:\n%v\nerr: %v\n",
ctx.Request().Header.String(), err)
return ctx.Send(s3err.GetAPIErrorResponse(
s3err.GetAPIError(s3err.ErrInternalError), "", "", ""))