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

Add a hidden combine-logs flag (#4766)

Browse Source 
This can be used when errors are happening early on to avoid them being
swallowed by logGate.

This also does a bit of cleanup of format env var checking --
helper/logging internally looks for this so it was totally unnecessary
since moving to hclog.
This commit is contained in:
Jeff Mitchell
2018-06-15 14:47:37 -04:00
committed by GitHub
parent 3c6bec9113
commit 2d923056c2
1 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
command/server.go
View File

@@ -63,8 +63,9 @@ type ServerCommand struct {
WaitGroup *sync.WaitGroup
logGate *gatedwriter.Writer
logger log.Logger
logWriter io.Writer
logGate *gatedwriter.Writer
logger log.Logger
cleanupGuard sync.Once
@@ -91,6 +92,7 @@ type ServerCommand struct {
flagDevFourCluster bool
flagDevTransactional bool
flagTestVerifyOnly bool
flagCombineLogs bool
}
type ServerListener struct {
@@ -259,7 +261,14 @@ func (c *ServerCommand) Flags() *FlagSets {
Hidden: true,
})
// TODO: should this be a public flag?
// TODO: should the below flags be public?
f.BoolVar(&BoolVar{
Name: "combine-logs",
Target: &c.flagCombineLogs,
Default: false,
Hidden: true,
})
f.BoolVar(&BoolVar{
Name: "test-verify-only",
Target: &c.flagTestVerifyOnly,
@@ -291,6 +300,10 @@ func (c *ServerCommand) Run(args []string) int {
// Create a logger. We wrap it in a gated writer so that it doesn't
// start logging too early.
c.logGate = &gatedwriter.Writer{Writer: os.Stderr}
c.logWriter = c.logGate
if c.flagCombineLogs {
c.logWriter = os.Stdout
}
var level log.Level
c.flagLogLevel = strings.ToLower(strings.TrimSpace(c.flagLogLevel))
switch c.flagLogLevel {
@@ -309,23 +322,14 @@ func (c *ServerCommand) Run(args []string) int {
return 1
}
logFormat := os.Getenv("VAULT_LOG_FORMAT")
if logFormat == "" {
logFormat = os.Getenv("LOGXI_FORMAT")
}
switch strings.ToLower(logFormat) {
case "vault", "vault_json", "vault-json", "vaultjson", "json", "":
if c.flagDevThreeNode || c.flagDevFourCluster {
c.logger = log.New(&log.LoggerOptions{
Mutex: &sync.Mutex{},
Output: c.logGate,
Level: log.Trace,
})
} else {
c.logger = logging.NewVaultLoggerWithWriter(c.logGate, level)
}
default:
c.logger = logging.NewVaultLoggerWithWriter(c.logGate, level)
if c.flagDevThreeNode || c.flagDevFourCluster {
c.logger = log.New(&log.LoggerOptions{
Mutex: &sync.Mutex{},
Output: c.logWriter,
Level: log.Trace,
})
} else {
c.logger = logging.NewVaultLoggerWithWriter(c.logWriter, level)
}
grpclog.SetLogger(&grpclogFaker{
@@ -679,7 +683,7 @@ CLUSTER_SYNTHESIS_COMPLETE:
lns := make([]ServerListener, 0, len(config.Listeners))
c.reloadFuncsLock.Lock()
for i, lnConfig := range config.Listeners {
ln, props, reloadFunc, err := server.NewListener(lnConfig.Type, lnConfig.Config, c.logGate, c.UI)
ln, props, reloadFunc, err := server.NewListener(lnConfig.Type, lnConfig.Config, c.logWriter, c.UI)
if err != nil {
c.UI.Error(fmt.Sprintf("Error initializing listener of type %s: %s", lnConfig.Type, err))
return 1
@@ -948,7 +952,9 @@ CLUSTER_SYNTHESIS_COMPLETE:
}
// Output the header that the server has started
c.UI.Output("==> Vault server started! Log data will stream in below:\n")
if !c.flagCombineLogs {
c.UI.Output("==> Vault server started! Log data will stream in below:\n")
}
// Inform any tests that the server is ready
select {