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

OSS parts of sighup license reload test (#11816)

Browse Source
This commit is contained in:
Josh Black
2021-06-11 09:08:19 -07:00
committed by GitHub
parent 3a333b9902
commit 38b6271de1
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
command/server.go
View File

@@ -99,10 +99,11 @@ type ServerCommand struct {
cleanupGuard sync.Once
reloadFuncsLock *sync.RWMutex
reloadFuncs *map[string][]reloadutil.ReloadFunc
startedCh chan (struct{}) // for tests
reloadedCh chan (struct{}) // for tests
reloadFuncsLock *sync.RWMutex
reloadFuncs *map[string][]reloadutil.ReloadFunc
startedCh chan (struct{}) // for tests
reloadedCh chan (struct{}) // for tests
licenseReloadedCh chan (error) // for tests
allLoggers []log.Logger
@@ -1564,8 +1565,13 @@ func (c *ServerCommand) Run(args []string) int {
}
// Reload license file
if err := vault.LicenseReload(core); err != nil {
c.UI.Error(fmt.Sprintf("Error reloading license: %v", err))
if err = vault.LicenseReload(core); err != nil {
c.UI.Error(err.Error())
}
select {
case c.licenseReloadedCh <- err:
default:
}
case <-c.SigUSR2Ch:

5
command/server_test.go
View File

@@ -96,8 +96,9 @@ func testServerCommand(tb testing.TB) (*cli.MockUi, *ServerCommand) {
},
// These prevent us from random sleep guessing...
startedCh: make(chan struct{}, 5),
reloadedCh: make(chan struct{}, 5),
startedCh: make(chan struct{}, 5),
reloadedCh: make(chan struct{}, 5),
licenseReloadedCh: make(chan error),
}
}