MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-11 15:03:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

Adding iodine to object_writer

Browse Source
This commit is contained in:
Frederick F. Kautz IV 2015-03-26 10:41:40 -07:00
parent 8cf66ede66
commit caf7e41499
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/storage/donut/object_writer.go
View File

@ -2,6 +2,7 @@ package donut
import ( import (
"encoding/json" "encoding/json"
"github.com/minio-io/iodine"
"io/ioutil" "io/ioutil"
"os" "os"
"path" "path"
@ -10,7 +11,7 @@ import (
func newDonutObjectWriter(objectDir string) (Writer, error) { func newDonutObjectWriter(objectDir string) (Writer, error) {
dataFile, err := os.OpenFile(path.Join(objectDir, "data"), os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0600) dataFile, err := os.OpenFile(path.Join(objectDir, "data"), os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0600)
if err != nil { if err != nil {
return nil, err return nil, iodine.Error(err, map[string]string{"objectDir": objectDir})
} }
return donutObjectWriter{ return donutObjectWriter{
root: objectDir, root: objectDir,
@ -29,26 +30,29 @@ type donutObjectWriter struct {
} }
func (d donutObjectWriter) Write(data []byte) (int, error) { func (d donutObjectWriter) Write(data []byte) (int, error) {
return d.file.Write(data) written, err := d.file.Write(data)
iodine.Error(err, nil)
return written, err
} }
func (d donutObjectWriter) Close() error { func (d donutObjectWriter) Close() error {
if d.err != nil { if d.err != nil {
return d.err return iodine.Error(d.err, nil)
} }
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 d.file.Close() return iodine.Error(d.file.Close(), nil)
} }
func (d donutObjectWriter) CloseWithError(err error) error { func (d donutObjectWriter) CloseWithError(err error) error {
if d.err != nil { if d.err != nil {
d.err = err d.err = err
} }
return d.Close() // TODO semantics between this and d.Close are weird, work out something better
return iodine.Error(d.Close(), nil)
} }
func (d donutObjectWriter) SetMetadata(metadata map[string]string) error { func (d donutObjectWriter) SetMetadata(metadata map[string]string) error {