1 files changed, 12 insertions, 6 deletions
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()