From 43ac0cdb9c4eea9d3c5eceb2c11b9e5b98b87b00 Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Mon, 30 May 2022 13:41:24 +0100 Subject: [chore] Global server configuration overhaul (#575) * move config flag names and usage to config package, rewrite config package to use global Configuration{} struct Signed-off-by: kim * improved code comment Signed-off-by: kim * linter Signed-off-by: kim * fix unmarshaling Signed-off-by: kim * remove kim's custom go compiler changes Signed-off-by: kim * generate setter and flag-name functions, implement these in codebase Signed-off-by: kim * update deps Signed-off-by: kim * small change Signed-off-by: kim * appease the linter... Signed-off-by: kim * move configuration into ConfigState structure, ensure reloading to/from viper settings to keep in sync Signed-off-by: kim * lint Signed-off-by: kim * update code comments Signed-off-by: kim * fix merge issue Signed-off-by: kim * fix merge issue Signed-off-by: kim * improved version string (removes time + go version) Signed-off-by: kim * fix version string build to pass test script + consolidate logic in func Signed-off-by: kim * add license text, update config.Defaults comment Signed-off-by: kim * add license text to generated config helpers file Signed-off-by: kim * defer unlock on config.Set___(), to ensure unlocked on panic Signed-off-by: kim * make it more obvious which cmd flags are being attached Signed-off-by: kim --- testrig/db.go | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'testrig/db.go') diff --git a/testrig/db.go b/testrig/db.go index 61d80e6ae..67bc681c6 100644 --- a/testrig/db.go +++ b/testrig/db.go @@ -24,7 +24,6 @@ import ( "strconv" "github.com/sirupsen/logrus" - "github.com/spf13/viper" "github.com/superseriousbusiness/gotosocial/internal/config" "github.com/superseriousbusiness/gotosocial/internal/db" "github.com/superseriousbusiness/gotosocial/internal/db/bundb" @@ -69,11 +68,15 @@ var testModels = []interface{}{ // value as the port instead. func NewTestDB() db.DB { if alternateAddress := os.Getenv("GTS_DB_ADDRESS"); alternateAddress != "" { - viper.Set(config.Keys.DbAddress, alternateAddress) + config.Config(func(cfg *config.Configuration) { + cfg.DbAddress = alternateAddress + }) } if alternateDBType := os.Getenv("GTS_DB_TYPE"); alternateDBType != "" { - viper.Set(config.Keys.DbType, alternateDBType) + config.Config(func(cfg *config.Configuration) { + cfg.DbType = alternateDBType + }) } if alternateDBPort := os.Getenv("GTS_DB_PORT"); alternateDBPort != "" { @@ -81,7 +84,9 @@ func NewTestDB() db.DB { if err != nil { panic(err) } - viper.Set(config.Keys.DbPort, port) + config.Config(func(cfg *config.Configuration) { + cfg.DbPort = int(port) + }) } testDB, err := bundb.NewBunDBService(context.Background()) -- cgit v1.2.3