From a04263c0a80361122d2d5a810be01ea3e5acb5d3 Mon Sep 17 00:00:00 2001 From: Cameron Nunez Date: Thu, 9 Sep 2021 15:56:38 -0400 Subject: [PATCH] log: fix lack of logging tags being improperly represented in the docs Release note: none --- docs/generated/logformats.md | 12 ++++++------ pkg/util/log/format_crdb_v2.go | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/generated/logformats.md b/docs/generated/logformats.md index eb197a4e3087..2c265d6f93fa 100644 --- a/docs/generated/logformats.md +++ b/docs/generated/logformats.md @@ -255,7 +255,7 @@ reliably that no counter was present. Example single-line unstructured entry: ~~~ -I210116 21:49:17.073282 14 server/node.go:464 ⋮ [] 23 started with engine type ‹2› +I210116 21:49:17.073282 14 server/node.go:464 ⋮ [-] 23 started with engine type ‹2› ~~~ Example multi-line unstructured entry: @@ -268,19 +268,19 @@ I210116 21:49:17.083093 14 1@cli/start.go:690 ⋮ [-] 40 +CockroachDB node start Example structured entry: ~~~ -I210116 21:49:17.080713 14 1@util/log/event_log.go:32 ⋮ [] 32 ={"Timestamp":1610833757080706620,"EventType":"node_restart"} +I210116 21:49:17.080713 14 1@util/log/event_log.go:32 ⋮ [-] 32 ={"Timestamp":1610833757080706620,"EventType":"node_restart"} ~~~ Example long entries broken up into multiple lines: ~~~ -I210116 21:49:17.073282 14 server/node.go:464 ⋮ [] 23 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.... -I210116 21:49:17.073282 14 server/node.go:464 ⋮ [] 23 |aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +I210116 21:49:17.073282 14 server/node.go:464 ⋮ [-] 23 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.... +I210116 21:49:17.073282 14 server/node.go:464 ⋮ [-] 23 |aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ~~~ ~~~ -I210116 21:49:17.080713 14 1@util/log/event_log.go:32 ⋮ [] 32 ={"Timestamp":1610833757080706620,"EventTy... -I210116 21:49:17.080713 14 1@util/log/event_log.go:32 ⋮ [] 32 |pe":"node_restart"} +I210116 21:49:17.080713 14 1@util/log/event_log.go:32 ⋮ [-] 32 ={"Timestamp":1610833757080706620,"EventTy... +I210116 21:49:17.080713 14 1@util/log/event_log.go:32 ⋮ [-] 32 |pe":"node_restart"} ~~~ ### Backward-compatibility notes diff --git a/pkg/util/log/format_crdb_v2.go b/pkg/util/log/format_crdb_v2.go index db49cd0a5ac8..f12bcdb991bc 100644 --- a/pkg/util/log/format_crdb_v2.go +++ b/pkg/util/log/format_crdb_v2.go @@ -115,7 +115,7 @@ reliably that no counter was present. Example single-line unstructured entry: ~~~ -I210116 21:49:17.073282 14 server/node.go:464 ⋮ [] 23 started with engine type ‹2› +I210116 21:49:17.073282 14 server/node.go:464 ⋮ [-] 23 started with engine type ‹2› ~~~ Example multi-line unstructured entry: @@ -128,19 +128,19 @@ I210116 21:49:17.083093 14 1@cli/start.go:690 ⋮ [-] 40 +CockroachDB node start Example structured entry: ~~~ -I210116 21:49:17.080713 14 1@util/log/event_log.go:32 ⋮ [] 32 ={"Timestamp":1610833757080706620,"EventType":"node_restart"} +I210116 21:49:17.080713 14 1@util/log/event_log.go:32 ⋮ [-] 32 ={"Timestamp":1610833757080706620,"EventType":"node_restart"} ~~~ Example long entries broken up into multiple lines: ~~~ -I210116 21:49:17.073282 14 server/node.go:464 ⋮ [] 23 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.... -I210116 21:49:17.073282 14 server/node.go:464 ⋮ [] 23 |aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +I210116 21:49:17.073282 14 server/node.go:464 ⋮ [-] 23 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.... +I210116 21:49:17.073282 14 server/node.go:464 ⋮ [-] 23 |aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ~~~ ~~~ -I210116 21:49:17.080713 14 1@util/log/event_log.go:32 ⋮ [] 32 ={"Timestamp":1610833757080706620,"EventTy... -I210116 21:49:17.080713 14 1@util/log/event_log.go:32 ⋮ [] 32 |pe":"node_restart"} +I210116 21:49:17.080713 14 1@util/log/event_log.go:32 ⋮ [-] 32 ={"Timestamp":1610833757080706620,"EventTy... +I210116 21:49:17.080713 14 1@util/log/event_log.go:32 ⋮ [-] 32 |pe":"node_restart"} ~~~ ### Backward-compatibility notes