storage: Make type/params configurable for #88

pkg/storage/file/fstore.go

@@ -48,11 +48,10 @@ type Store struct {
 }
 
 // New creates a new DataStore object using the specified path
-func New(cfg config.Storage) storage.Store {
-	path := cfg.Path
+func New(cfg config.Storage) (storage.Store, error) {
+	path := cfg.Params["path"]
 	if path == "" {
-		log.Errorf("No value configured for datastore path")
-		return nil
+		return nil, fmt.Errorf("'path' parameter not specified")
 	}
 	mailPath := filepath.Join(path, "mail")
 	if _, err := os.Stat(mailPath); err != nil {
@@ -61,7 +60,7 @@ func New(cfg config.Storage) storage.Store {
 			log.Errorf("Error creating dir %q: %v", mailPath, err)
 		}
 	}
-	return &Store{path: path, mailPath: mailPath, messageCap: cfg.MailboxMsgCap}
+	return &Store{path: path, mailPath: mailPath, messageCap: cfg.MailboxMsgCap}, nil
 }
 
 // AddMessage adds a message to the specified mailbox.

pkg/storage/file/fstore_test.go

@@ -265,13 +265,18 @@ func setupDataStore(cfg config.Storage) (*Store, *bytes.Buffer) {
 	if err != nil {
 		panic(err)
 	}
-
-	// Capture log output
+	// Capture log output.
 	buf := new(bytes.Buffer)
 	log.SetOutput(buf)
-
-	cfg.Path = path
-	return New(cfg).(*Store), buf
+	if cfg.Params == nil {
+		cfg.Params = make(map[string]string)
+	}
+	cfg.Params["path"] = path
+	s, err := New(cfg)
+	if err != nil {
+		panic(err)
+	}
+	return s.(*Store), buf
 }
 
 // deliverMessage creates and delivers a message to the specific mailbox, returning