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 --- cmd/gotosocial/server.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'cmd/gotosocial/server.go') diff --git a/cmd/gotosocial/server.go b/cmd/gotosocial/server.go index fda5bad90..42d5543ea 100644 --- a/cmd/gotosocial/server.go +++ b/cmd/gotosocial/server.go @@ -21,7 +21,6 @@ package main import ( "github.com/spf13/cobra" "github.com/superseriousbusiness/gotosocial/cmd/gotosocial/action/server" - "github.com/superseriousbusiness/gotosocial/cmd/gotosocial/flag" "github.com/superseriousbusiness/gotosocial/internal/config" ) @@ -31,7 +30,6 @@ func serverCommands() *cobra.Command { Use: "server", Short: "gotosocial server-related tasks", } - serverStartCmd := &cobra.Command{ Use: "start", Short: "start the gotosocial server", @@ -42,8 +40,7 @@ func serverCommands() *cobra.Command { return run(cmd.Context(), server.Start) }, } - flag.Server(serverStartCmd, config.Defaults) - + config.AddServerFlags(serverStartCmd) serverCmd.AddCommand(serverStartCmd) return serverCmd } -- cgit v1.2.3