From c04bbf9c82f216891ba44b8b5b621b8020963086 Mon Sep 17 00:00:00 2001 From: Laria Carolin Chabowski Date: Fri, 29 Sep 2017 07:57:09 +0200 Subject: Restructure package storage --- main.go | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) (limited to 'main.go') diff --git a/main.go b/main.go index 6b2b55e..11202f3 100644 --- a/main.go +++ b/main.go @@ -97,27 +97,9 @@ func loadConfig() bool { storageName = conf.DefaultStorage } - storageOptions, ok := conf.Storage[storageName] - if !ok { - fmt.Fprintf(os.Stderr, "Storage %s not found\n", storageName) - return false - } - - var method string - if err := storageOptions.Get("method", &method); err != nil { - fmt.Fprintf(os.Stderr, "Failed setting up storage %s: %s\n", storageName, err) - return false - } - - st, ok := registry.StorageTypes[method] - if !ok { - fmt.Fprintf(os.Stderr, "Failed setting up storage %s: Method %s unknown", storageName, method) - return false - } - - s, err := st(conf, storageName) + s, err := registry.LoadStorage(conf, storageName) if err != nil { - fmt.Fprintf(os.Stderr, "Failed setting up storage %s: %s\n", storageName, err) + fmt.Fprintln(os.Stderr, err) return false } -- cgit v1.2.3-54-g00ecf