From b098aa2dc8c97025769d2055beb761ea35b3366a Mon Sep 17 00:00:00 2001 From: Niko Storni Date: Wed, 14 May 2025 00:58:37 +0200 Subject: [PATCH] stupid viper... --- cmd/blobcache.go | 4 ++-- cmd/reflector2.go | 4 ++-- cmd/upload.go | 4 ++-- config/loader.go | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmd/blobcache.go b/cmd/blobcache.go index c5e2abf..3fca467 100644 --- a/cmd/blobcache.go +++ b/cmd/blobcache.go @@ -28,13 +28,13 @@ func init() { } func blobcacheCmd(cmd *cobra.Command, args []string) { - store, err := config.LoadStores(conf, "blobcache.yaml") + store, err := config.LoadStores(conf, "blobcache") if err != nil { log.Fatal(err) } defer store.Shutdown() - servers, err := config.LoadServers(store, conf, "blobcache.yaml") + servers, err := config.LoadServers(store, conf, "blobcache") if err != nil { log.Fatal(err) } diff --git a/cmd/reflector2.go b/cmd/reflector2.go index bf74438..55c1101 100644 --- a/cmd/reflector2.go +++ b/cmd/reflector2.go @@ -39,13 +39,13 @@ func init() { } func reflector2Cmd(cmd *cobra.Command, args []string) { - store, err := config.LoadStores(conf, "reflector.yaml") + store, err := config.LoadStores(conf, "reflector") if err != nil { log.Fatal(err) } defer store.Shutdown() - servers, err := config.LoadServers(store, conf, "reflector.yaml") + servers, err := config.LoadServers(store, conf, "reflector") if err != nil { log.Fatal(err) } diff --git a/cmd/upload.go b/cmd/upload.go index 95feae4..77ba8d8 100644 --- a/cmd/upload.go +++ b/cmd/upload.go @@ -31,13 +31,13 @@ func init() { } func uploadCmd(cmd *cobra.Command, args []string) { - store, err := config.LoadStores(conf, "upload.yaml") + store, err := config.LoadStores(conf, "upload") if err != nil { log.Fatal(err) } defer store.Shutdown() - databaseConn, err := config.LoadDatabase(conf, "upload.yaml") + databaseConn, err := config.LoadDatabase(conf, "upload") if err != nil { log.Fatal(err) } diff --git a/config/loader.go b/config/loader.go index a5c38f1..57e7e2f 100644 --- a/config/loader.go +++ b/config/loader.go @@ -46,7 +46,7 @@ func LoadStores(path, file string) (store.BlobStore, error) { func LoadServers(store store.BlobStore, path, file string) ([]server.BlobServer, error) { v := viper.New() v.AddConfigPath(path) - v.SetConfigName(file) + v.SetConfigFile(file) err := v.ReadInConfig() if err != nil { return nil, errors.Err(err) @@ -77,7 +77,7 @@ func LoadServers(store store.BlobStore, path, file string) ([]server.BlobServer, func LoadDatabase(path, file string) (*db.SQL, error) { v := viper.New() v.AddConfigPath(path) - v.SetConfigName(file) + v.SetConfigFile(file) err := v.ReadInConfig() if err != nil { return nil, errors.Err(err)