vbatts/registry
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Adds ability to unwrap ipc errors into their original type

Browse source 
This only works for a specific whitelist of error types, which is
currently all errors in the storagedriver package.

Also improves storagedriver tests to enforce proper error types are
returned
This commit is contained in:
Brian Bland 2014-11-18 17:41:48 -08:00
parent 1e8f0ce50a
commit a3481c5f1c
5 changed files with 85 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

11
storagedriver/filesystem/driver.go
View file

@ -84,7 +84,7 @@ func (d *Driver) PutContent(subPath string, contents []byte) error {
func (d *Driver) ReadStream(path string, offset uint64) (io.ReadCloser, error) {
file, err := os.OpenFile(d.subPath(path), os.O_RDONLY, 0644)
if err != nil {
return nil, err
return nil, storagedriver.PathNotFoundError{Path: path}
}
seekPos, err := file.Seek(int64(offset), os.SEEK_SET)
@ -201,7 +201,14 @@ func (d *Driver) List(subPath string) ([]string, error) {
// Move moves an object stored at sourcePath to destPath, removing the original
// object.
func (d *Driver) Move(sourcePath string, destPath string) error {
err := os.Rename(d.subPath(sourcePath), d.subPath(destPath))
source := d.subPath(sourcePath)
dest := d.subPath(destPath)
if _, err := os.Stat(source); os.IsNotExist(err) {
return storagedriver.PathNotFoundError{Path: sourcePath}
}
err := os.Rename(source, dest)
return err
}