diff options
| author |  kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> | 2022-05-30 13:41:24 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2022-05-30 14:41:24 +0200 |
| commit | 43ac0cdb9c4eea9d3c5eceb2c11b9e5b98b87b00 (patch) | |
| tree | f0d5967d0ce639b6bc82aaf607f62e228fdf4559 /internal/log | |
| parent | [chore] Mastodon api fixups (#617) (diff) | |
| download | gotosocial-43ac0cdb9c4eea9d3c5eceb2c11b9e5b98b87b00.tar.xz | |
[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 <grufwub@gmail.com>
* improved code comment
Signed-off-by: kim <grufwub@gmail.com>
* linter
Signed-off-by: kim <grufwub@gmail.com>
* fix unmarshaling
Signed-off-by: kim <grufwub@gmail.com>
* remove kim's custom go compiler changes
Signed-off-by: kim <grufwub@gmail.com>
* generate setter and flag-name functions, implement these in codebase
Signed-off-by: kim <grufwub@gmail.com>
* update deps
Signed-off-by: kim <grufwub@gmail.com>
* small change
Signed-off-by: kim <grufwub@gmail.com>
* appease the linter...
Signed-off-by: kim <grufwub@gmail.com>
* move configuration into ConfigState structure, ensure reloading to/from viper settings to keep in sync
Signed-off-by: kim <grufwub@gmail.com>
* lint
Signed-off-by: kim <grufwub@gmail.com>
* update code comments
Signed-off-by: kim <grufwub@gmail.com>
* fix merge issue
Signed-off-by: kim <grufwub@gmail.com>
* fix merge issue
Signed-off-by: kim <grufwub@gmail.com>
* improved version string (removes time + go version)
Signed-off-by: kim <grufwub@gmail.com>
* fix version string build to pass test script + consolidate logic in func
Signed-off-by: kim <grufwub@gmail.com>
* add license text, update config.Defaults comment
Signed-off-by: kim <grufwub@gmail.com>
* add license text to generated config helpers file
Signed-off-by: kim <grufwub@gmail.com>
* defer unlock on config.Set___(), to ensure unlocked on panic
Signed-off-by: kim <grufwub@gmail.com>
* make it more obvious which cmd flags are being attached
Signed-off-by: kim <grufwub@gmail.com>
Diffstat (limited to 'internal/log')
| -rw-r--r-- | internal/log/log.go | 14 | ||||
| -rw-r--r-- | internal/log/syslog_test.go | 15 |
2 files changed, 13 insertions, 16 deletions
diff --git a/internal/log/log.go b/internal/log/log.go index f5ce7ec24..7ffa31c99 100644 --- a/internal/log/log.go +++ b/internal/log/log.go @@ -26,7 +26,6 @@ import ( "github.com/sirupsen/logrus" lSyslog "github.com/sirupsen/logrus/hooks/syslog" - "github.com/spf13/viper" "github.com/superseriousbusiness/gotosocial/internal/config" ) @@ -48,12 +47,9 @@ func Initialize() error { FullTimestamp: true, }) - keys := config.Keys - // check if a desired log level has been set - logLevel := viper.GetString(keys.LogLevel) - if logLevel != "" { - level, err := logrus.ParseLevel(logLevel) + if lvl := config.GetLogLevel(); lvl != "" { + level, err := logrus.ParseLevel(lvl) if err != nil { return err } @@ -65,9 +61,9 @@ func Initialize() error { } // check if syslog has been enabled, and configure it if so - if syslogEnabled := viper.GetBool(keys.SyslogEnabled); syslogEnabled { - protocol := viper.GetString(keys.SyslogProtocol) - address := viper.GetString(keys.SyslogAddress) + if config.GetSyslogEnabled() { + protocol := config.GetSyslogProtocol() + address := config.GetSyslogAddress() hook, err := lSyslog.NewSyslogHook(protocol, address, syslog.LOG_INFO, "") if err != nil { 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) |