Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport of Restore 'server' and 'agent' base loggers to use their original names into release/1.13.x #19308

Merged
merged 2 commits into from
Feb 23, 2023
Merged

Backport of Restore 'server' and 'agent' base loggers to use their original names into release/1.13.x #19308

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d59d84c
backport of commit 7d52daf715c9738d32c3a388d60fddc09550ac31
Feb 23, 2023
73c27e7
Merge branch 'release/1.13.x' into backport/fix/pr-18031/base-logger-…
Feb 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion command/agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1253,7 +1253,7 @@ func (c *AgentCommand) newLogger() (log.InterceptLogger, error) {
}

logCfg := &logging.LogConfig{
Name: "vault-agent",
Name: "agent",
LogLevel: logLevel,
LogFormat: logFormat,
LogFilePath: c.config.LogFile,
Expand Down
1 change: 0 additions & 1 deletion command/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1721,7 +1721,6 @@ func (c *ServerCommand) configureLogging(config *server.Config) (hclog.Intercept
}

logCfg := &loghelper.LogConfig{
Name: "vault",
LogLevel: logLevel,
LogFormat: logFormat,
LogFilePath: config.LogFile,
Expand Down