mirror/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2024-12-24 00:37:28 +00:00
Code Issues Releases Wiki Activity

s3: Correct prefix for layout

Browse source
This commit is contained in:
Alexander Neumann 2017-04-17 19:18:47 +02:00
parent 16fd1c2352
commit 28968caf33
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/restic/backend/s3/s3.go
View file

@ -45,7 +45,7 @@ func Open(cfg Config) (restic.Backend, error) {
bucketname: cfg.Bucket, bucketname: cfg.Bucket,
prefix: cfg.Prefix, prefix: cfg.Prefix,
cacheObjSize: make(map[string]int64), cacheObjSize: make(map[string]int64),
Layout: &backend.S3Layout{URL: cfg.Endpoint, Join: path.Join}, Layout: &backend.S3Layout{Path: cfg.Prefix, Join: path.Join},
} }
tr := &http.Transport{MaxIdleConnsPerHost: connLimit} tr := &http.Transport{MaxIdleConnsPerHost: connLimit}
@ -88,10 +88,10 @@ func (be *s3) Save(h restic.Handle, rd io.Reader) (err error) {
return err return err
} }
debug.Log("Save %v", h)
objName := be.Filename(h) objName := be.Filename(h)
debug.Log("Save %v at %v", h, objName)
// Check key does not already exist // Check key does not already exist
_, err = be.client.StatObject(be.bucketname, objName) _, err = be.client.StatObject(be.bucketname, objName)
if err == nil { if err == nil {
@ -128,7 +128,7 @@ func (wr wrapReader) Close() error {
// given offset. If length is nonzero, only a portion of the file is // given offset. If length is nonzero, only a portion of the file is
// returned. rd must be closed after use. // returned. rd must be closed after use.
func (be *s3) Load(h restic.Handle, length int, offset int64) (io.ReadCloser, error) { func (be *s3) Load(h restic.Handle, length int, offset int64) (io.ReadCloser, error) {
debug.Log("Load %v, length %v, offset %v", h, length, offset) debug.Log("Load %v, length %v, offset %v from %v", h, length, offset, be.Filename(h))
if err := h.Valid(); err != nil { if err := h.Valid(); err != nil {
return nil, err return nil, err
} }
@ -280,7 +280,7 @@ func (be *s3) Test(h restic.Handle) (bool, error) {
func (be *s3) Remove(h restic.Handle) error { func (be *s3) Remove(h restic.Handle) error {
objName := be.Filename(h) objName := be.Filename(h)
err := be.client.RemoveObject(be.bucketname, objName) err := be.client.RemoveObject(be.bucketname, objName)
debug.Log("Remove(%v) -> err %v", h, err) debug.Log("Remove(%v) at %v -> err %v", h, objName, err)
return errors.Wrap(err, "client.RemoveObject") return errors.Wrap(err, "client.RemoveObject")
} }