Backport of fix log_requests_level misconfiguration into release/1.…

…15.x (#24059) * backport of commit 0f5f648 * changelog --------- Co-authored-by: Peter Wilson <[email protected]>
hashicorp · Nov 8, 2023 · f921f72 · f921f72
1 parent cf1b5ca
commit f921f72
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/changelog/24059.txt b/changelog/24059.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+core/config: Use correct HCL config value when configuring `log_requests_level`.
+```
diff --git a/vault/core.go b/vault/core.go
@@ -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")
@@ -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)

diff --git a/vault/core_test.go b/vault/core_test.go
@@ -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()))
 		})
 	}