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/router.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'testrig/router.go') diff --git a/testrig/router.go b/testrig/router.go index 468b468c6..e06e21bd4 100644 --- a/testrig/router.go +++ b/testrig/router.go @@ -26,7 +26,6 @@ import ( "runtime" "github.com/gin-gonic/gin" - "github.com/spf13/viper" "github.com/superseriousbusiness/gotosocial/internal/config" "github.com/superseriousbusiness/gotosocial/internal/db" "github.com/superseriousbusiness/gotosocial/internal/router" @@ -38,11 +37,13 @@ import ( // value as the template base directory instead. func NewTestRouter(db db.DB) router.Router { if alternativeTemplateBaseDir := os.Getenv("GTS_WEB_TEMPLATE_BASE_DIR"); alternativeTemplateBaseDir != "" { - viper.Set(config.Keys.WebTemplateBaseDir, alternativeTemplateBaseDir) + config.Config(func(cfg *config.Configuration) { + cfg.WebTemplateBaseDir = alternativeTemplateBaseDir + }) } if alternativeBindAddress := os.Getenv("GTS_BIND_ADDRESS"); alternativeBindAddress != "" { - viper.Set(config.Keys.BindAddress, alternativeBindAddress) + config.SetBindAddress(alternativeBindAddress) } r, err := router.New(context.Background(), db) @@ -56,7 +57,7 @@ func NewTestRouter(db db.DB) router.Router { func ConfigureTemplatesWithGin(engine *gin.Engine) { router.LoadTemplateFunctions(engine) - templateBaseDir := viper.GetString(config.Keys.WebTemplateBaseDir) + templateBaseDir := config.GetWebTemplateBaseDir() if !filepath.IsAbs(templateBaseDir) { // https://stackoverflow.com/questions/31873396/is-it-possible-to-get-the-current-root-of-package-structure-as-a-string-in-golan -- cgit v1.2.3