From 784ed3edf4e67cb216727b2f8c9b8dafb4194be1 Mon Sep 17 00:00:00 2001 From: Liu kang Date: Wed, 16 Aug 2023 14:38:38 +0800 Subject: [PATCH 1/2] Missing trace output on syslog level writer --- syslog.go | 5 +++-- syslog_test.go | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/syslog.go b/syslog.go index c4082830..af6a49bc 100644 --- a/syslog.go +++ b/syslog.go @@ -34,8 +34,8 @@ func SyslogLevelWriter(w SyslogWriter) LevelWriter { } // SyslogCEEWriter wraps a SyslogWriter with a SyslogLevelWriter that adds a -// MITRE CEE prefix for JSON syslog entries, compatible with rsyslog -// and syslog-ng JSON logging support. +// MITRE CEE prefix for JSON syslog entries, compatible with rsyslog +// and syslog-ng JSON logging support. // See https://www.rsyslog.com/json-elasticsearch/ func SyslogCEEWriter(w SyslogWriter) LevelWriter { return syslogWriter{w, ceePrefix} @@ -57,6 +57,7 @@ func (sw syslogWriter) Write(p []byte) (n int, err error) { func (sw syslogWriter) WriteLevel(level Level, p []byte) (n int, err error) { switch level { case TraceLevel: + err = sw.w.Debug(sw.prefix + string(p)) case DebugLevel: err = sw.w.Debug(sw.prefix + string(p)) case InfoLevel: diff --git a/syslog_test.go b/syslog_test.go index c168ba6a..f3ed9010 100644 --- a/syslog_test.go +++ b/syslog_test.go @@ -60,6 +60,7 @@ func TestSyslogWriter(t *testing.T) { log.Error().Msg("error") log.Log().Msg("nolevel") want := []syslogEvent{ + {"Trace", `{"level":"trace","message":"trace"}` + "\n"}, {"Debug", `{"level":"debug","message":"debug"}` + "\n"}, {"Info", `{"level":"info","message":"info"}` + "\n"}, {"Warning", `{"level":"warn","message":"warn"}` + "\n"}, From 9d565407ce0ede41dc8767e33102bd9518bcc508 Mon Sep 17 00:00:00 2001 From: Liu kang Date: Thu, 17 Aug 2023 07:30:06 +0800 Subject: [PATCH 2/2] ut error --- syslog_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/syslog_test.go b/syslog_test.go index f3ed9010..7126e612 100644 --- a/syslog_test.go +++ b/syslog_test.go @@ -1,5 +1,5 @@ -// +build !binary_log -// +build !windows +//go:build !binary_log && !windows +// +build !binary_log,!windows package zerolog @@ -60,7 +60,7 @@ func TestSyslogWriter(t *testing.T) { log.Error().Msg("error") log.Log().Msg("nolevel") want := []syslogEvent{ - {"Trace", `{"level":"trace","message":"trace"}` + "\n"}, + {"Debug", `{"level":"trace","message":"trace"}` + "\n"}, {"Debug", `{"level":"debug","message":"debug"}` + "\n"}, {"Info", `{"level":"info","message":"info"}` + "\n"}, {"Warning", `{"level":"warn","message":"warn"}` + "\n"},