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/log.go | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'internal/log/log.go') 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 { -- cgit v1.2.3