MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-02-13 06:38:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #336 from harshavardhana/pr_out_donutfilewriter_should_return_value_of_file_close_

Browse Source
This commit is contained in:
Harshavardhana 2015-03-22 14:51:47 -07:00
commit dcd9a8ae12
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/storage/donut/donutdriver.go
View File

@ -327,23 +327,19 @@ func (d donutFileWriter) Close() error {
if d.err != nil { if d.err != nil {
return d.err return d.err
} }
d.file.Close()
metadata, _ := json.Marshal(d.metadata) metadata, _ := json.Marshal(d.metadata)
ioutil.WriteFile(path.Join(d.root, "metadata.json"), metadata, 0600) ioutil.WriteFile(path.Join(d.root, "metadata.json"), metadata, 0600)
donutMetadata, _ := json.Marshal(d.donutMetadata) donutMetadata, _ := json.Marshal(d.donutMetadata)
ioutil.WriteFile(path.Join(d.root, "donutMetadata.json"), donutMetadata, 0600) ioutil.WriteFile(path.Join(d.root, "donutMetadata.json"), donutMetadata, 0600)
return nil return d.file.Close()
} }
func (d donutFileWriter) CloseWithError(err error) error { func (d donutFileWriter) CloseWithError(err error) error {
if d.err != nil { if d.err != nil {
d.err = err d.err = err
} }
d.file.Close() return d.Close()
return nil
} }
func (d donutFileWriter) SetMetadata(metadata map[string]string) error { func (d donutFileWriter) SetMetadata(metadata map[string]string) error {