From 6934ae378ab5743da80a5995fc74d167502187b1 Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Tue, 12 Jul 2022 08:32:20 +0100 Subject: [chore] improved router logging, recovery and error handling (#705) * move panic recovery to logging middleware, improve logging + panic recovery logic Signed-off-by: kim * remove dead code Signed-off-by: kim * remove skip paths code Signed-off-by: kim * re-enable log quoting Signed-off-by: kim * use human-friendly bytesize in logging body size Signed-off-by: kim * only disable quoting in debug builds Signed-off-by: kim * use logrus level instead of debug.DEBUG() to enable/disable quoting Signed-off-by: kim * shutup linter Signed-off-by: kim * fix instance tests Signed-off-by: kim * fix gin test contexts created with missing engine HTML renderer Signed-off-by: kim * add note regarding not logging query parameters Signed-off-by: kim * better explain 'DisableQuoting' logic Signed-off-by: kim * add license text Signed-off-by: kim --- internal/log/log.go | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'internal/log/log.go') diff --git a/internal/log/log.go b/internal/log/log.go index 7ffa31c99..67dd03606 100644 --- a/internal/log/log.go +++ b/internal/log/log.go @@ -41,12 +41,6 @@ func Initialize() error { out := SplitErrOutputs(os.Stdout, os.Stderr) logrus.SetOutput(out) - logrus.SetFormatter(&logrus.TextFormatter{ - DisableColors: true, - DisableQuote: true, - FullTimestamp: true, - }) - // check if a desired log level has been set if lvl := config.GetLogLevel(); lvl != "" { level, err := logrus.ParseLevel(lvl) @@ -60,6 +54,18 @@ func Initialize() error { } } + // set our custom formatter options + logrus.SetFormatter(&logrus.TextFormatter{ + DisableColors: true, + FullTimestamp: true, + + // By default, quoting is enabled to help differentiate key-value + // fields in log lines. But when debug (or higher, e.g. trace) logging + // is enabled, we disable this. This allows easier copy-pasting of + // entry fields without worrying about escaped quotes. + DisableQuote: logrus.GetLevel() >= logrus.DebugLevel, + }) + // check if syslog has been enabled, and configure it if so if config.GetSyslogEnabled() { protocol := config.GetSyslogProtocol() -- cgit v1.2.3