diff --git a/cmd/geth/testdata/logging/logtest-json.txt b/cmd/geth/testdata/logging/logtest-json.txt index b7e928a168..49c83480e9 100644 --- a/cmd/geth/testdata/logging/logtest-json.txt +++ b/cmd/geth/testdata/logging/logtest-json.txt @@ -48,5 +48,5 @@ {"time":"2023-11-22T15:42:00.40835+08:00","level":"INFO","msg":"raw nil","res":null} {"time":"2023-11-22T15:42:00.408354+08:00","level":"INFO","msg":"(*uint64)(nil)","res":null} {"time":"2023-11-22T15:42:00.408361+08:00","level":"INFO","msg":"Using keys 't', 'level', 'time', 'level' and 'msg'","time":"time","t":"t","level":"level","lvl":"lvl","msg":"msg"} -{"time":"2023-11-29T15:13:00.195655931+01:00","level":"INFO","msg":"Odd pair (1 attr)","key":null,"LOG_ERROR":"Normalized odd number of arguments by adding nil"} -{"time":"2023-11-29T15:13:00.195681832+01:00","level":"INFO","msg":"Odd pair (3 attr)","key":"value","key2":null,"LOG_ERROR":"Normalized odd number of arguments by adding nil"} +{"time":"2023-11-29T15:13:00.195655931+01:00","level":"INFO","msg":"Odd pair (1 attr)","!BADKEY":"key"} +{"time":"2023-11-29T15:13:00.195681832+01:00","level":"INFO","msg":"Odd pair (3 attr)","key":"value","!BADKEY":"key2"} diff --git a/cmd/geth/testdata/logging/logtest-logfmt.txt b/cmd/geth/testdata/logging/logtest-logfmt.txt index 2ac38ee6b8..67bd8773c2 100644 --- a/cmd/geth/testdata/logging/logtest-logfmt.txt +++ b/cmd/geth/testdata/logging/logtest-logfmt.txt @@ -48,5 +48,5 @@ time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg=nil-custom-struct res= time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg="raw nil" res= time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg=(*uint64)(nil) res= time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg="Using keys 't', 'lvl', 'time', 'level' and 'msg'" t=t time=time lvl=lvl level=level msg=msg -time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg="Odd pair (1 attr)" key= LOG_ERROR="Normalized odd number of arguments by adding nil" -time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg="Odd pair (3 attr)" key=value key2= LOG_ERROR="Normalized odd number of arguments by adding nil" +time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg="Odd pair (1 attr)" !BADKEY=key +time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg="Odd pair (3 attr)" key=value !BADKEY=key2 diff --git a/cmd/geth/testdata/logging/logtest-terminal.txt b/cmd/geth/testdata/logging/logtest-terminal.txt index e3b562117c..8038353621 100644 --- a/cmd/geth/testdata/logging/logtest-terminal.txt +++ b/cmd/geth/testdata/logging/logtest-terminal.txt @@ -49,5 +49,5 @@ INFO [xx-xx|xx:xx:xx.xxx] nil-custom-struct res= INFO [xx-xx|xx:xx:xx.xxx] raw nil res= INFO [xx-xx|xx:xx:xx.xxx] (*uint64)(nil) res= INFO [xx-xx|xx:xx:xx.xxx] Using keys 't', 'lvl', 'time', 'level' and 'msg' t=t time=time lvl=lvl level=level msg=msg -INFO [xx-xx|xx:xx:xx.xxx] Odd pair (1 attr) key= LOG_ERROR="Normalized odd number of arguments by adding nil" -INFO [xx-xx|xx:xx:xx.xxx] Odd pair (3 attr) key=value key2= LOG_ERROR="Normalized odd number of arguments by adding nil" +INFO [xx-xx|xx:xx:xx.xxx] Odd pair (1 attr) "!BADKEY"=key +INFO [xx-xx|xx:xx:xx.xxx] Odd pair (3 attr) key=value "!BADKEY"=key2 diff --git a/log/logger.go b/log/logger.go index 93d62f080b..83ff0c7d92 100644 --- a/log/logger.go +++ b/log/logger.go @@ -159,9 +159,6 @@ func (l *logger) Write(level slog.Level, msg string, attrs ...any) { var pcs [1]uintptr runtime.Callers(3, pcs[:]) - if len(attrs)%2 != 0 { - attrs = append(attrs, nil, errorKey, "Normalized odd number of arguments by adding nil") - } r := slog.NewRecord(time.Now(), level, msg, pcs[0]) r.Add(attrs...) l.inner.Handler().Handle(context.Background(), r)