mirrors/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-05-04 20:06:27 +02:00
Code Issues Projects Releases Wiki Activity

Log proxy settings from environment on startup (#7528)

Browse Source
This commit is contained in:
Jim Kalafut 2019-09-30 08:46:42 -07:00 committed by GitHub
parent cdeb3f0eb9
commit b68573fa74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
command/server.go
View File

@ -20,6 +20,8 @@ import (
"sync"
"time"
"golang.org/x/net/http/httpproxy"
"github.com/hashicorp/vault/helper/metricsutil"
monitoring "cloud.google.com/go/monitoring/apiv3"
@ -549,6 +551,11 @@ func (c *ServerCommand) Run(args []string) int {
vault.DefaultMaxRequestDuration = config.DefaultMaxRequestDuration
}
// log proxy settings
proxyCfg := httpproxy.FromEnvironment()
c.logger.Info("proxy environment", "http_proxy", proxyCfg.HTTPProxy,
"https_proxy", proxyCfg.HTTPSProxy, "no_proxy", proxyCfg.NoProxy)
// 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.