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 --- internal/log/syslog_test.go | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'internal/log/syslog_test.go') diff --git a/internal/log/syslog_test.go b/internal/log/syslog_test.go index 6507afa52..d58dfdcba 100644 --- a/internal/log/syslog_test.go +++ b/internal/log/syslog_test.go @@ -26,7 +26,6 @@ import ( "github.com/google/uuid" "github.com/sirupsen/logrus" - "github.com/spf13/viper" "github.com/stretchr/testify/suite" "github.com/superseriousbusiness/gotosocial/internal/config" "github.com/superseriousbusiness/gotosocial/testrig" @@ -45,9 +44,10 @@ type SyslogTestSuite struct { func (suite *SyslogTestSuite) SetupTest() { testrig.InitTestConfig() - viper.Set(config.Keys.SyslogEnabled, true) - viper.Set(config.Keys.SyslogProtocol, "udp") - viper.Set(config.Keys.SyslogAddress, "127.0.0.1:42069") + config.SetSyslogEnabled(true) + config.SetSyslogProtocol("udp") + config.SetSyslogAddress("127.0.0.1:42069") + server, channel, err := testrig.InitTestSyslog() if err != nil { panic(err) @@ -93,9 +93,10 @@ func (suite *SyslogTestSuite) TestSyslogLongMessageUnixgram() { syslogServer := server syslogChannel := channel - viper.Set(config.Keys.SyslogEnabled, true) - viper.Set(config.Keys.SyslogProtocol, "unixgram") - viper.Set(config.Keys.SyslogAddress, socketPath) + config.SetSyslogEnabled(true) + config.SetSyslogProtocol("unixgram") + config.SetSyslogAddress(socketPath) + testrig.InitTestLog() logrus.Warn(longMessage) -- cgit v1.2.3