From d25996d4768344f60e16cb4ff7231283106c96fd Mon Sep 17 00:00:00 2001
From: Chulki Lee <chulki.lee@gmail.com>
Date: Wed, 8 Aug 2018 12:53:53 -0700
Subject: [PATCH] Fix invalid json in log

---
 pkg/config/log.go                                        | 9 ++++++++-
 .../notes/fix-invalid-json-f5a3e8b4f8ee75e5.yaml         | 4 ++++
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/fix-invalid-json-f5a3e8b4f8ee75e5.yaml

diff --git a/pkg/config/log.go b/pkg/config/log.go
index 2dc33fdfbbbbb8..803a798b3d5763 100644
--- a/pkg/config/log.go
+++ b/pkg/config/log.go
@@ -107,7 +107,7 @@ func SetupLogger(logLevel, logFile, uri string, rfc, logToConsole, jsonFormat bo
 
 	configTemplate += fmt.Sprintf(`</outputs>
 	<formats>
-		<format id="json" format="{&quot;time&quot;:&quot;%%Date(%s)&quot;,&quot;level&quot;:&quot;%%LEVEL&quot;,&quot;file&quot;:&quot;%%File&quot;,&quot;line&quot;:&quot;%%Line&quot;,&quot;func&quot;:&quot;%%FuncShort&quot;,&quot;msg&quot;:&quot;%%Msg&quot;}%%n"/>
+		<format id="json" format="{&quot;time&quot;:&quot;%%Date(%s)&quot;,&quot;level&quot;:&quot;%%LEVEL&quot;,&quot;file&quot;:&quot;%%File&quot;,&quot;line&quot;:&quot;%%Line&quot;,&quot;func&quot;:&quot;%%FuncShort&quot;,&quot;msg&quot;:&quot;%%QuoteMsg&quot;}%%n"/>
 		<format id="common" format="%%Date(%s) | %%LEVEL | (%%File:%%Line in %%FuncShort) | %%Msg%%n"/>
 		<format id="syslog-json" format="%%CustomSyslogHeader(20,`+strconv.FormatBool(rfc)+`){&quot;level&quot;:&quot;%%LEVEL&quot;,&quot;relfile&quot;:&quot;%%RelFile&quot;,&quot;line&quot;:&quot;%%Line&quot;,&quot;msg&quot;:&quot;%%Msg&quot;}%%n"/>
 		<format id="syslog-common" format="%%CustomSyslogHeader(20,`+strconv.FormatBool(rfc)+`) %%LEVEL | (%%RelFile:%%Line) | %%Msg%%n" />
@@ -304,7 +304,14 @@ func (s *SyslogReceiver) Close() error {
 	return nil
 }
 
+func createQuoteMsgFormatter(params string) seelog.FormatterFunc {
+	return func(message string, level seelog.LogLevel, context seelog.LogContextInterface) interface{} {
+		return strconv.Quote(message)
+	}
+}
+
 func init() {
+	seelog.RegisterCustomFormatter("QuoteMsg", createQuoteMsgFormatter)
 	seelog.RegisterCustomFormatter("CustomSyslogHeader", createSyslogHeaderFormatter)
 	seelog.RegisterReceiver("syslog", &SyslogReceiver{})
 }
diff --git a/releasenotes/notes/fix-invalid-json-f5a3e8b4f8ee75e5.yaml b/releasenotes/notes/fix-invalid-json-f5a3e8b4f8ee75e5.yaml
new file mode 100644
index 00000000000000..5472a0e9ddcb77
--- /dev/null
+++ b/releasenotes/notes/fix-invalid-json-f5a3e8b4f8ee75e5.yaml
@@ -0,0 +1,4 @@
+---
+fixes:
+  - |
+    Fix invalid JSON in log