forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

log: remove custom normalization of key/value pairs

Browse source
This commit is contained in:
Martin Holst Swende 2023-12-05 12:21:30 +01:00
parent 58378e0764
commit 6f2793d1f5
No known key found for this signature in database
GPG key ID: 683B438C05A5DDF0
4 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmd/geth/testdata/logging/logtest-json.txt vendored
View file

@ -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.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.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-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.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","key2":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","!BADKEY":"key2"}

4
cmd/geth/testdata/logging/logtest-logfmt.txt vendored
View file

@ -48,5 +48,5 @@ time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg=nil-custom-struct res=<nil>
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg="raw nil" res=<nil> time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg="raw nil" res=<nil>
time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg=(*uint64)(nil) res=<nil> time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg=(*uint64)(nil) res=<nil>
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="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=<nil> 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 key2=<nil> LOG_ERROR="Normalized odd number of arguments by adding nil" time=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx level=INFO msg="Odd pair (3 attr)" key=value !BADKEY=key2

4
cmd/geth/testdata/logging/logtest-terminal.txt vendored
View file

@ -49,5 +49,5 @@ INFO [xx-xx|xx:xx:xx.xxx] nil-custom-struct res=<nil>
INFO [xx-xx|xx:xx:xx.xxx] raw nil res=<nil> INFO [xx-xx|xx:xx:xx.xxx] raw nil res=<nil>
INFO [xx-xx|xx:xx:xx.xxx] (*uint64)(nil) res=<nil> INFO [xx-xx|xx:xx:xx.xxx] (*uint64)(nil) res=<nil>
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] 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=<nil> 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 key2=<nil> LOG_ERROR="Normalized odd number of arguments by adding nil" INFO [xx-xx|xx:xx:xx.xxx] Odd pair (3 attr) key=value "!BADKEY"=key2

3
log/logger.go
View file

@ -159,9 +159,6 @@ func (l *logger) Write(level slog.Level, msg string, attrs ...any) {
var pcs [1]uintptr var pcs [1]uintptr
runtime.Callers(3, pcs[:]) 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 := slog.NewRecord(time.Now(), level, msg, pcs[0])
r.Add(attrs...) r.Add(attrs...)
l.inner.Handler().Handle(context.Background(), r) l.inner.Handler().Handle(context.Background(), r)