scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-01 11:08:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

CE part of https://github.com/hashicorp/vault-enterprise/pull/4269 (#26406)

Browse Source
This commit is contained in:
Nick Cabatoff
2024-04-15 16:08:57 -04:00
committed by GitHub
parent 0701cc368c
commit 2560beea8e
13 changed files with 222 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
command/server.go
View File

@@ -1682,11 +1682,17 @@ func (c *ServerCommand) Run(args []string) int {
level, err := loghelper.ParseLogLevel(config.LogLevel)
if err != nil {
c.logger.Error("unknown log level found on reload", "level", config.LogLevel)
goto RUNRELOADFUNCS
} else {
core.SetLogLevel(level)
}
core.SetLogLevel(level)
}
if err := core.ReloadCensus(); err != nil {
c.UI.Error(err.Error())
}
core.ReloadReplicationCanaryWriteInterval()
RUNRELOADFUNCS:
if err := c.Reload(c.reloadFuncsLock, c.reloadFuncs, c.flagConfigs, core); err != nil {
c.UI.Error(fmt.Sprintf("Error(s) were encountered during reload: %s", err))
@@ -1697,9 +1703,6 @@ func (c *ServerCommand) Run(args []string) int {
c.UI.Error(err.Error())
}
if err := core.ReloadCensus(); err != nil {
c.UI.Error(err.Error())
}
select {
case c.licenseReloadedCh <- err:
default: