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.

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

Backport of fix log_requests_level misconfiguration into release/1.15.x #24059

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions changelog/24059.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
core/config: Use correct HCL config value when configuring `log_requests_level`.
```
8 changes: 4 additions & 4 deletions vault/core.go
Original file line number Diff line number Diff line change
Expand Up @@ -1249,8 +1249,8 @@ func NewCore(conf *CoreConfig) (*Core, error) {
return nil, err
}

// Log level
c.configureLogRequestLevel(conf.RawConfig.LogLevel)
// Log requests level
c.configureLogRequestsLevel(conf.RawConfig.LogRequestsLevel)

// Quotas
quotasLogger := conf.Logger.Named("quotas")
Expand Down Expand Up @@ -1306,8 +1306,8 @@ func (c *Core) configureListeners(conf *CoreConfig) error {
return nil
}

// configureLogRequestLevel configures the Core with the supplied log level.
func (c *Core) configureLogRequestLevel(level string) {
// configureLogRequestsLevel configures the Core with the supplied log requests level.
func (c *Core) configureLogRequestsLevel(level string) {
c.logRequestsLevel = uberAtomic.NewInt32(0)

lvl := log.LevelFromString(level)
Expand Down
4 changes: 2 additions & 2 deletions vault/core_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -254,12 +254,12 @@ func TestNewCore_configureLogRequestLevel(t *testing.T) {
t.Run(name, func(t *testing.T) {
t.Parallel()

// We need to supply a logger, as configureLogRequestLevel emits
// We need to supply a logger, as configureLogRequestsLevel emits
// warnings to the logs in certain circumstances.
core := &Core{
logger: corehelpers.NewTestLogger(t),
}
core.configureLogRequestLevel(tc.level)
core.configureLogRequestsLevel(tc.level)
require.Equal(t, tc.expectedLevel, log.Level(core.logRequestsLevel.Load()))
})
}
Expand Down