From 3bf78fde47ff99aa63988b9193bccead48f706d5 Mon Sep 17 00:00:00 2001 From: Luiz Aoqui Date: Thu, 13 Jan 2022 09:56:35 -0500 Subject: [PATCH] Fix log level parsing from lines that include a timestamp (#11838) --- .changelog/11838.txt | 3 +++ command/agent/command.go | 5 ++++- go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 .changelog/11838.txt diff --git a/.changelog/11838.txt b/.changelog/11838.txt new file mode 100644 index 00000000000..2647aaf8365 --- /dev/null +++ b/.changelog/11838.txt @@ -0,0 +1,3 @@ +```release-note:bug +agent: Fixed an issue that caused Consul values to be logged during template rendering +``` diff --git a/command/agent/command.go b/command/agent/command.go index 2966bd49dfd..83fa97b68f3 100644 --- a/command/agent/command.go +++ b/command/agent/command.go @@ -687,7 +687,10 @@ func (c *Command) Run(args []string) int { // Wrap log messages emitted with the 'log' package. // These usually come from external dependencies. - log.SetOutput(logger.StandardWriter(&hclog.StandardLoggerOptions{InferLevels: true})) + log.SetOutput(logger.StandardWriter(&hclog.StandardLoggerOptions{ + InferLevels: true, + InferLevelsWithTimestamp: true, + })) log.SetPrefix("") log.SetFlags(0) diff --git a/go.mod b/go.mod index d44648aa748..32372871e8f 100644 --- a/go.mod +++ b/go.mod @@ -59,7 +59,7 @@ require ( github.com/hashicorp/go-discover v0.0.0-20210818145131-c573d69da192 github.com/hashicorp/go-envparse v0.0.0-20180119215841-310ca1881b22 github.com/hashicorp/go-getter v1.5.11 - github.com/hashicorp/go-hclog v1.0.0 + github.com/hashicorp/go-hclog v1.1.0 github.com/hashicorp/go-immutable-radix v1.3.0 github.com/hashicorp/go-memdb v1.3.2 github.com/hashicorp/go-msgpack v1.1.5 diff --git a/go.sum b/go.sum index c904bb7e18e..215d1cec68a 100644 --- a/go.sum +++ b/go.sum @@ -497,8 +497,8 @@ github.com/hashicorp/go-hclog v0.9.1/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrj github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-hclog v1.0.0 h1:bkKf0BeBXcSYa7f5Fyi9gMuQ8gNsxeiNpZjR6VxNZeo= -github.com/hashicorp/go-hclog v1.0.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= +github.com/hashicorp/go-hclog v1.1.0 h1:QsGcniKx5/LuX2eYoeL+Np3UKYPNaN7YKpTh29h8rbw= +github.com/hashicorp/go-hclog v1.1.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-immutable-radix v1.1.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-immutable-radix v1.2.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=