From eb2acd11c229839cd8e955a70e4c0f61ead53777 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sun, 17 Jun 2018 13:01:57 -0700 Subject: decouple from viper for filer store --- weed/filer2/postgres/postgres_store.go | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'weed/filer2/postgres/postgres_store.go') diff --git a/weed/filer2/postgres/postgres_store.go b/weed/filer2/postgres/postgres_store.go index 3bec55def..f5904ab21 100644 --- a/weed/filer2/postgres/postgres_store.go +++ b/weed/filer2/postgres/postgres_store.go @@ -7,7 +7,6 @@ import ( "github.com/chrislusf/seaweedfs/weed/filer2" "github.com/chrislusf/seaweedfs/weed/filer2/abstract_sql" _ "github.com/lib/pq" - "github.com/spf13/viper" ) const ( @@ -26,16 +25,16 @@ func (store *PostgresStore) GetName() string { return "postgres" } -func (store *PostgresStore) Initialize(viper *viper.Viper) (err error) { +func (store *PostgresStore) Initialize(configuration filer2.Configuration) (err error) { return store.initialize( - viper.GetString("username"), - viper.GetString("password"), - viper.GetString("hostname"), - viper.GetInt("port"), - viper.GetString("database"), - viper.GetString("sslmode"), - viper.GetInt("connection_max_idle"), - viper.GetInt("connection_max_open"), + configuration.GetString("username"), + configuration.GetString("password"), + configuration.GetString("hostname"), + configuration.GetInt("port"), + configuration.GetString("database"), + configuration.GetString("sslmode"), + configuration.GetInt("connection_max_idle"), + configuration.GetInt("connection_max_open"), ) } -- cgit v1.2.3