mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-09 13:50:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

Close response bodies

Browse Source
This commit is contained in:
Benedikt Kulmann
2020-10-19 15:43:38 +02:00
parent 1bf3896107
commit 48b30a3efc
4 changed files with 37 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
accounts/pkg/indexer/index/cs3/autoincrement.go
View File

@@ -269,10 +269,13 @@ func (idx *Autoincrement) createSymlink(oldname, newname string) error {
return os.ErrExist
}
_, err = idx.dataProvider.put(newname, strings.NewReader(oldname), t)
resp, err := idx.dataProvider.put(newname, strings.NewReader(oldname), t)
if err != nil {
return err
}
if err = resp.Body.Close(); err != nil {
return err
}
return nil
@@ -300,7 +303,9 @@ func (idx *Autoincrement) resolveSymlink(name string) (string, error) {
b, err := ioutil.ReadAll(resp.Body)
if err != nil {
return "", err
}
if err = resp.Body.Close(); err != nil {
return "", err
}
return string(b), err
}

9
accounts/pkg/indexer/index/cs3/non_unique.go
View File

@@ -336,10 +336,13 @@ func (idx *NonUnique) createSymlink(oldname, newname string) error {
return os.ErrExist
}
_, err = idx.dataProvider.put(newname, strings.NewReader(oldname), t)
resp, err := idx.dataProvider.put(newname, strings.NewReader(oldname), t)
if err != nil {
return err
}
if err = resp.Body.Close(); err != nil {
return err
}
return nil
@@ -367,7 +370,9 @@ func (idx *NonUnique) resolveSymlink(name string) (string, error) {
b, err := ioutil.ReadAll(resp.Body)
if err != nil {
return "", err
}
if err = resp.Body.Close(); err != nil {
return "", err
}
return string(b), err
}

9
accounts/pkg/indexer/index/cs3/unique.go
View File

@@ -270,10 +270,13 @@ func (idx *Unique) createSymlink(oldname, newname string) error {
return os.ErrExist
}
_, err = idx.dataProvider.put(newname, strings.NewReader(oldname), t)
resp, err := idx.dataProvider.put(newname, strings.NewReader(oldname), t)
if err != nil {
return err
}
if err = resp.Body.Close(); err != nil {
return err
}
return nil
@@ -301,7 +304,9 @@ func (idx *Unique) resolveSymlink(name string) (string, error) {
b, err := ioutil.ReadAll(resp.Body)
if err != nil {
return "", err
}
if err = resp.Body.Close(); err != nil {
return "", err
}
return string(b), err
}

20
accounts/pkg/storage/cs3.go
View File

@@ -73,8 +73,14 @@ func (r CS3Repo) WriteAccount(ctx context.Context, a *proto.Account) (err error)
return err
}
_, err = r.dataProvider.put(r.accountURL(a.Id), bytes.NewReader(by), t)
return err
resp, err := r.dataProvider.put(r.accountURL(a.Id), bytes.NewReader(by), t)
if err != nil {
return err
}
if err = resp.Body.Close(); err != nil {
return err
}
return nil
}
// LoadAccount loads an account via cs3 by id and writes it to the provided account
@@ -147,8 +153,14 @@ func (r CS3Repo) WriteGroup(ctx context.Context, g *proto.Group) (err error) {
return err
}
_, err = r.dataProvider.put(r.groupURL(g.Id), bytes.NewReader(by), t)
return err
resp, err := r.dataProvider.put(r.groupURL(g.Id), bytes.NewReader(by), t)
if err != nil {
return err
}
if err = resp.Body.Close(); err != nil {
return err
}
return nil
}
// LoadGroup loads a group via cs3 by id and writes it to the provided group