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

Add disable_mlock env support (#9931)

Browse Source
This commit is contained in:
Jason O'Donnell
2020-09-11 12:56:30 -04:00
committed by GitHub
parent dba37adcb5
commit 54d0ad7938
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
command/server.go
View File

@@ -801,7 +801,6 @@ type quiescenceSink struct {
t *time.Timer t *time.Timer
} }
func (q quiescenceSink) Accept(name string, level log.Level, msg string, args ...interface{}) { func (q quiescenceSink) Accept(name string, level log.Level, msg string, args ...interface{}) {
q.t.Reset(100 * time.Millisecond) q.t.Reset(100 * time.Millisecond)
} }
@@ -944,6 +943,15 @@ func (c *ServerCommand) Run(args []string) int {
logProxyEnvironmentVariables(c.logger) logProxyEnvironmentVariables(c.logger)
if envMlock := os.Getenv("VAULT_DISABLE_MLOCK"); envMlock != "" {
var err error
config.DisableMlock, err = strconv.ParseBool(envMlock)
if err != nil {
c.UI.Output("Error parsing the environment variable VAULT_DISABLE_MLOCK")
return 1
}
}
// If mlockall(2) isn't supported, show a warning. We disable this in dev // If mlockall(2) isn't supported, show a warning. We disable this in dev
// because it is quite scary to see when first using Vault. We also disable // because it is quite scary to see when first using Vault. We also disable
// this if the user has explicitly disabled mlock in configuration. // this if the user has explicitly disabled mlock in configuration.