From d6d54ed0bcf3b583fe681db790740cef137401d3 Mon Sep 17 00:00:00 2001 From: Niall Sheridan Date: Sat, 8 Oct 2016 00:57:10 -0500 Subject: Replace the 'datastore' option with a 'database' option The 'datastore' string option is deprecated and will be removed in a future version. The new 'database' map option is preferred. --- cmd/cashierd/main.go | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'cmd') diff --git a/cmd/cashierd/main.go b/cmd/cashierd/main.go index de8b45f..7df85e6 100644 --- a/cmd/cashierd/main.go +++ b/cmd/cashierd/main.go @@ -297,23 +297,6 @@ func readConfig(filename string) (*config.Config, error) { return config.ReadConfig(f) } -func certStore(config string) (store.CertStorer, error) { - var cstore store.CertStorer - var err error - engine := strings.Split(config, ":")[0] - switch engine { - case "mysql", "sqlite": - cstore, err = store.NewSQLStore(config) - case "mongo": - cstore, err = store.NewMongoStore(config) - case "mem": - cstore = store.NewMemoryStore() - default: - cstore = store.NewMemoryStore() - } - return cstore, err -} - func loadCerts(certFile, keyFile string) (tls.Certificate, error) { key, err := wkfs.ReadFile(keyFile) if err != nil { @@ -388,7 +371,7 @@ func main() { log.Fatal(err) } - certstore, err := certStore(config.Server.Datastore) + certstore, err := store.New(config.Server.Database) if err != nil { log.Fatal(err) } -- cgit v1.2.3