Rooba
/
perkeep
mirror of https://github.com/perkeep/perkeep.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed redundant code. 

Change-Id: I172091bd84fcc88561969882ff19396c963a582f
This commit is contained in:
Pawel Szczur 2013-01-12 01:48:44 +01:00
parent 1a977ac877
commit f1798f2c75
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/blobserver/localdisk/localdisk.go
View File

@ -48,7 +48,7 @@ func New(root string) (*DiskStorage, error) {
return nil, fmt.Errorf("Storage root %q doesn't exist", root) return nil, fmt.Errorf("Storage root %q doesn't exist", root)
} }
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("Failed to stat directory %q: %v", root, err)
} }
if !fi.IsDir() { if !fi.IsDir() {
return nil, fmt.Errorf("Storage root %q exists but is not a directory.", root) return nil, fmt.Errorf("Storage root %q exists but is not a directory.", root)
@ -64,24 +64,11 @@ func New(root string) (*DiskStorage, error) {
} }
func newFromConfig(_ blobserver.Loader, config jsonconfig.Obj) (storage blobserver.Storage, err error) { func newFromConfig(_ blobserver.Loader, config jsonconfig.Obj) (storage blobserver.Storage, err error) {
sto := &DiskStorage{ path := config.RequiredString("path")
SimpleBlobHubPartitionMap: &blobserver.SimpleBlobHubPartitionMap{},
root: config.RequiredString("path"),
}
if err := config.Validate(); err != nil { if err := config.Validate(); err != nil {
return nil, err return nil, err
} }
fi, err := os.Stat(sto.root) return New(path)
if err != nil {
return nil, fmt.Errorf("Failed to stat directory %q: %v", sto.root, err)
}
if !fi.IsDir() {
return nil, fmt.Errorf("Path %q isn't a directory", sto.root)
}
if _, _, err := sto.StorageGeneration(); err != nil {
return nil, fmt.Errorf("Error initialization generation for %q: %v", sto.root, err)
}
return sto, nil
} }
func init() { func init() {