Skip to content

Commit

Permalink
Add disable_mlock env support (#9931)
Browse files Browse the repository at this point in the history
  • Loading branch information
jasonodonnell authored Sep 11, 2020
1 parent dba37ad commit 54d0ad7
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion command/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -801,7 +801,6 @@ type quiescenceSink struct {
t *time.Timer
}


func (q quiescenceSink) Accept(name string, level log.Level, msg string, args ...interface{}) {
q.t.Reset(100 * time.Millisecond)
}
Expand Down Expand Up @@ -944,6 +943,15 @@ func (c *ServerCommand) Run(args []string) int {

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
// because it is quite scary to see when first using Vault. We also disable
// this if the user has explicitly disabled mlock in configuration.
Expand Down

0 comments on commit 54d0ad7

Please sign in to comment.