From 62fd9166ceb7a960f19a00dc290926c3764dd4db Mon Sep 17 00:00:00 2001
From: Brian Tiger Chow <brian.holderchow@gmail.com>
Date: Tue, 4 Nov 2014 19:09:47 -0800
Subject: [PATCH] fix(ipfs2/init) datastore
---
cmd/ipfs2/init.go | 50 ++++++++++++++++++++++++++++-------------------
1 file changed, 30 insertions(+), 20 deletions(-)
diff --git a/cmd/ipfs2/init.go b/cmd/ipfs2/init.go
index b1db2692f..9f3c071cc 100644
--- a/cmd/ipfs2/init.go
+++ b/cmd/ipfs2/init.go
@@ -86,28 +86,11 @@ func doInit(configRoot string, dspath string, force bool, nBitsForKeypair int) e
}
cfg := new(config.Config)
- if len(dspath) == 0 {
- dspath, err = config.DataStorePath("")
- if err != nil {
- return err
- }
- }
- cfg.Datastore = config.Datastore{
- Path: dspath,
- Type: "leveldb",
- }
-
- // Construct the data store if missing
- if err := os.MkdirAll(dspath, os.ModePerm); err != nil {
+ ds, err := datastoreConfig(dspath)
+ if err != nil {
return err
}
-
- // Check the directory is writeable
- if f, err := os.Create(filepath.Join(dspath, "._check_writeable")); err == nil {
- os.Remove(f.Name())
- } else {
- return errors.New("Datastore '" + dspath + "' is not writeable")
- }
+ cfg.Datastore = ds
cfg.Identity = config.Identity{}
@@ -162,3 +145,30 @@ func doInit(configRoot string, dspath string, force bool, nBitsForKeypair int) e
}
return nil
}
+
+func datastoreConfig(dspath string) (config.Datastore, error) {
+ ds := config.Datastore{}
+ if len(dspath) == 0 {
+ var err error
+ dspath, err = config.DataStorePath("")
+ if err != nil {
+ return ds, err
+ }
+ }
+ ds.Path = dspath
+ ds.Type = "leveldb"
+
+ // Construct the data store if missing
+ if err := os.MkdirAll(dspath, os.ModePerm); err != nil {
+ return ds, err
+ }
+
+ // Check the directory is writeable
+ if f, err := os.Create(filepath.Join(dspath, "._check_writeable")); err == nil {
+ os.Remove(f.Name())
+ } else {
+ return ds, errors.New("Datastore '" + dspath + "' is not writeable")
+ }
+
+ return ds, nil
+}
--
GitLab